Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node-v0.x-archive
base: b233131901de
Choose a base ref
...
head repository: nodejs/node-v0.x-archive
compare: e82e86b1a7fc
Choose a head ref
  • 2 commits
  • 0 files changed
  • 1 contributor

Commits on Feb 18, 2015

  1. console: allow Object.prototype fields as labels

    This is a backport of 6c3647c from
    v0.12 to v0.10.
    
    Console.prototype.timeEnd() returns NaN if the timer label
    corresponds to a property on Object.prototype. In v0.12, this was fixed
    by using Object.create(null) to construct the _times object
    
    However, the version of V8 in the v0.10 branch makes this fix not work
    as expected. In v0.10, this commit changes the _times object into a
    array of objects of the form:
    
    { label: someLabel, time: staringWallClockTime }
    
    someLabel can thus be any string, including any string that represents
    any Object.prototype field.
    
    Fixes #9116.
    
    PR: #9215
    PR-URL: #9215
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Julien Gilli committed Feb 18, 2015
    Copy the full SHA
    c8239c0 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2015

  1. Merge remote-tracking branch 'upstream/v0.10' into v0.12

    Conflicts:
    	lib/console.js
    	test/simple/test-console.js
    Julien Gilli committed Feb 28, 2015
    Copy the full SHA
    e82e86b View commit details
    Browse the repository at this point in the history