Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(523)

Side by Side Diff: Source/bindings/v8/ScriptValue.cpp

Issue 314953005: Add an ASSERT about cross-world wrapper leakage into ScriptValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "bindings/v8/ScriptState.h" 34 #include "bindings/v8/ScriptState.h"
35 #include "bindings/v8/V8Binding.h" 35 #include "bindings/v8/V8Binding.h"
36 #include "platform/JSONValues.h" 36 #include "platform/JSONValues.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 ScriptValue::~ScriptValue() 40 ScriptValue::~ScriptValue()
41 { 41 {
42 } 42 }
43 43
44 v8::Handle<v8::Value> ScriptValue::v8Value() const
45 {
46 if (isEmpty())
47 return v8::Handle<v8::Value>();
48
49 ASSERT(isolate()->InContext());
50
51 // This is a check to validate that you don't return a ScriptValue to a worl d different
52 // from the world that created the ScriptValue.
53 // Probably this could be:
54 // if (&m_scriptState->world() == &DOMWrapperWorld::current(isolate()))
55 // return v8::Handle<v8::Value>();
56 // instead of triggering RELEASE_ASSERT.
57 RELEASE_ASSERT(&m_scriptState->world() == &DOMWrapperWorld::current(isolate( )));
58 return m_value->newLocal(isolate());
59 }
60
44 bool ScriptValue::toString(String& result) const 61 bool ScriptValue::toString(String& result) const
45 { 62 {
46 if (isEmpty()) 63 if (isEmpty())
47 return false; 64 return false;
48 65
49 v8::HandleScope handleScope(isolate()); 66 ScriptState::Scope scope(m_scriptState.get());
50 v8::Handle<v8::Value> string = v8Value(); 67 v8::Handle<v8::Value> string = v8Value();
51 if (string.IsEmpty() || !string->IsString()) 68 if (string.IsEmpty() || !string->IsString())
52 return false; 69 return false;
53 result = toCoreString(v8::Handle<v8::String>::Cast(string)); 70 result = toCoreString(v8::Handle<v8::String>::Cast(string));
54 return true; 71 return true;
55 } 72 }
56 73
57 PassRefPtr<JSONValue> ScriptValue::toJSONValue(ScriptState* scriptState) const 74 PassRefPtr<JSONValue> ScriptValue::toJSONValue(ScriptState* scriptState) const
58 { 75 {
59 ASSERT(!scriptState->contextIsEmpty()); 76 ASSERT(!scriptState->contextIsEmpty());
60 ScriptState::Scope scope(scriptState); 77 ScriptState::Scope scope(scriptState);
61 return v8ToJSONValue(scriptState->isolate(), v8Value(), JSONValue::maxDepth) ; 78 return v8ToJSONValue(scriptState->isolate(), v8Value(), JSONValue::maxDepth) ;
62 } 79 }
63 80
64 } // namespace WebCore 81 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698