| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009 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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 ASSERT(v8::Context::InContext()); | 584 ASSERT(v8::Context::InContext()); |
| 585 return DOMWrapperWorld::isolatedWorld(v8::Context::GetCurrent()); | 585 return DOMWrapperWorld::isolatedWorld(v8::Context::GetCurrent()); |
| 586 } | 586 } |
| 587 | 587 |
| 588 v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate* isolate, Sc
riptWrappable* wrappable, v8::Handle<v8::String> key) | 588 v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate* isolate, Sc
riptWrappable* wrappable, v8::Handle<v8::String> key) |
| 589 { | 589 { |
| 590 v8::Local<v8::Object> wrapper = wrappable->newLocalWrapper(isolate); | 590 v8::Local<v8::Object> wrapper = wrappable->newLocalWrapper(isolate); |
| 591 return wrapper.IsEmpty() ? v8::Local<v8::Value>() : wrapper->GetHiddenValue(
key); | 591 return wrapper.IsEmpty() ? v8::Local<v8::Value>() : wrapper->GetHiddenValue(
key); |
| 592 } | 592 } |
| 593 | 593 |
| 594 v8::Isolate* isolateForScriptExecutionContext(ScriptExecutionContext* context) | 594 v8::Isolate* toIsolate(ScriptExecutionContext* context) |
| 595 { | 595 { |
| 596 if (context && context->isDocument()) { | 596 if (context && context->isDocument()) { |
| 597 static v8::Isolate* mainWorldIsolate = 0; | 597 static v8::Isolate* mainWorldIsolate = 0; |
| 598 if (!mainWorldIsolate) | 598 if (!mainWorldIsolate) |
| 599 mainWorldIsolate = v8::Isolate::GetCurrent(); | 599 mainWorldIsolate = v8::Isolate::GetCurrent(); |
| 600 return mainWorldIsolate; | 600 return mainWorldIsolate; |
| 601 } | 601 } |
| 602 return v8::Isolate::GetCurrent(); | 602 return v8::Isolate::GetCurrent(); |
| 603 } | 603 } |
| 604 | 604 |
| 605 v8::Isolate* isolateForFrame(Frame* frame) | 605 v8::Isolate* toIsolate(Frame* frame) |
| 606 { | 606 { |
| 607 return frame->script()->isolate(); | 607 return frame->script()->isolate(); |
| 608 } | 608 } |
| 609 | 609 |
| 610 } // namespace WebCore | 610 } // namespace WebCore |
| OLD | NEW |