Index: Source/bindings/core/v8/ScriptController.cpp |
diff --git a/Source/bindings/v8/ScriptController.cpp b/Source/bindings/core/v8/ScriptController.cpp |
similarity index 97% |
rename from Source/bindings/v8/ScriptController.cpp |
rename to Source/bindings/core/v8/ScriptController.cpp |
index ed8f910f6b0c95f3e25696276c3bc11c6733a0c8..405b8ebff98935b96e60894e7785f3c106d69274 100644 |
--- a/Source/bindings/v8/ScriptController.cpp |
+++ b/Source/bindings/core/v8/ScriptController.cpp |
@@ -30,24 +30,24 @@ |
*/ |
#include "config.h" |
-#include "bindings/v8/ScriptController.h" |
- |
+#include "bindings/core/v8/ScriptController.h" |
+ |
+#include "bindings/core/v8/BindingSecurity.h" |
+#include "bindings/core/v8/NPV8Object.h" |
+#include "bindings/core/v8/ScriptCallStackFactory.h" |
+#include "bindings/core/v8/ScriptSourceCode.h" |
+#include "bindings/core/v8/ScriptValue.h" |
+#include "bindings/core/v8/V8Binding.h" |
#include "bindings/core/v8/V8Event.h" |
+#include "bindings/core/v8/V8GCController.h" |
#include "bindings/core/v8/V8HTMLElement.h" |
+#include "bindings/core/v8/V8NPObject.h" |
+#include "bindings/core/v8/V8PerContextData.h" |
+#include "bindings/core/v8/V8ScriptRunner.h" |
#include "bindings/core/v8/V8Window.h" |
-#include "bindings/v8/BindingSecurity.h" |
-#include "bindings/v8/NPV8Object.h" |
-#include "bindings/v8/ScriptCallStackFactory.h" |
-#include "bindings/v8/ScriptSourceCode.h" |
-#include "bindings/v8/ScriptValue.h" |
-#include "bindings/v8/V8Binding.h" |
-#include "bindings/v8/V8GCController.h" |
-#include "bindings/v8/V8NPObject.h" |
-#include "bindings/v8/V8PerContextData.h" |
-#include "bindings/v8/V8ScriptRunner.h" |
-#include "bindings/v8/V8WindowShell.h" |
-#include "bindings/v8/npruntime_impl.h" |
-#include "bindings/v8/npruntime_priv.h" |
+#include "bindings/core/v8/V8WindowShell.h" |
+#include "bindings/core/v8/npruntime_impl.h" |
+#include "bindings/core/v8/npruntime_priv.h" |
#include "core/dom/Document.h" |
#include "core/dom/Node.h" |
#include "core/dom/ScriptableDocumentParser.h" |
@@ -216,13 +216,13 @@ V8WindowShell* ScriptController::existingWindowShell(DOMWrapperWorld& world) |
V8WindowShell* ScriptController::windowShell(DOMWrapperWorld& world) |
{ |
V8WindowShell* shell = 0; |
- if (world.isMainWorld()) |
+ if (world.isMainWorld()) { |
shell = m_windowShell.get(); |
- else { |
+ } else { |
IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(world.worldId()); |
- if (iter != m_isolatedWorlds.end()) |
+ if (iter != m_isolatedWorlds.end()) { |
shell = iter->value.get(); |
- else { |
+ } else { |
OwnPtr<V8WindowShell> isolatedWorldShell = V8WindowShell::create(m_frame, world, m_isolate); |
shell = isolatedWorldShell.get(); |
m_isolatedWorlds.set(world.worldId(), isolatedWorldShell.release()); |