src/runtime.cc - Issue 194973005: Merged r19816 into trunk branch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/runtime.cc

Issue 194973005: Merged r19816 into trunk branch. (Closed) Base URL: https://v8.googlecode.com/svn/trunk

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc

index 7e47615b5765d7b9037fc93aae74ab7c9a1884ae..aa7568805f8a7eacd3adf48dc48fb1822b42b599 100644

--- a/src/runtime.cc

+++ b/src/runtime.cc

@@ -1649,7 +1649,7 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_SetPrototype) {

ASSERT(args.length() == 2);

CONVERT_ARG_HANDLE_CHECKED(JSObject, obj, 0);

CONVERT_ARG_HANDLE_CHECKED(Object, prototype, 1);

- if (obj->map()->is_observed()) {

+ if (FLAG_harmony_observation && obj->map()->is_observed()) {

Handle<Object> old_value(

GetPrototypeSkipHiddenPrototypes(isolate, *obj), isolate);

« no previous file with comments | « src/objects.cc ('k') | src/version.cc » ('j') | no next file with comments »