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 20 matching lines...) Expand all Loading... |
31 #include "config.h" | 31 #include "config.h" |
32 #include "V8Binding.h" | 32 #include "V8Binding.h" |
33 | 33 |
34 #include "BindingVisitors.h" | 34 #include "BindingVisitors.h" |
35 #include "DOMStringList.h" | 35 #include "DOMStringList.h" |
36 #include "Element.h" | 36 #include "Element.h" |
37 #include "Frame.h" | 37 #include "Frame.h" |
38 #include "FrameLoader.h" | 38 #include "FrameLoader.h" |
39 #include "FrameLoaderClient.h" | 39 #include "FrameLoaderClient.h" |
40 #include "QualifiedName.h" | 40 #include "QualifiedName.h" |
| 41 #include "ScriptController.h" |
41 #include "Settings.h" | 42 #include "Settings.h" |
42 #include "V8DOMStringList.h" | 43 #include "V8DOMStringList.h" |
43 #include "V8DOMWindow.h" | 44 #include "V8DOMWindow.h" |
44 #include "V8Element.h" | 45 #include "V8Element.h" |
45 #include "V8NodeFilterCondition.h" | 46 #include "V8NodeFilterCondition.h" |
46 #include "V8ObjectConstructor.h" | 47 #include "V8ObjectConstructor.h" |
47 #include "V8WorkerContext.h" | 48 #include "V8WorkerContext.h" |
48 #include "V8XPathNSResolver.h" | 49 #include "V8XPathNSResolver.h" |
49 #include "WebCoreMemoryInstrumentation.h" | 50 #include "WebCoreMemoryInstrumentation.h" |
50 #include "WorkerContext.h" | 51 #include "WorkerContext.h" |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 if (!DOMWrapperWorld::isolatedWorldsExist()) | 406 if (!DOMWrapperWorld::isolatedWorldsExist()) |
406 return MainWorld; | 407 return MainWorld; |
407 ASSERT(!v8::Context::GetEntered().IsEmpty()); | 408 ASSERT(!v8::Context::GetEntered().IsEmpty()); |
408 DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Context:
:GetEntered()); | 409 DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Context:
:GetEntered()); |
409 if (isolatedWorld) | 410 if (isolatedWorld) |
410 return IsolatedWorld; | 411 return IsolatedWorld; |
411 return MainWorld; | 412 return MainWorld; |
412 } | 413 } |
413 | 414 |
414 } // namespace WebCore | 415 } // namespace WebCore |
OLD | NEW |