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