Title: [126389] trunk/Source/WebCore
- Revision
- 126389
- Author
- [email protected]
- Date
- 2012-08-22 20:46:53 -0700 (Wed, 22 Aug 2012)
Log Message
[V8] Move m_isolatedWorlds and m_isolatedWorldSecurityOrigins from V8Proxy to ScriptController
https://bugs.webkit.org/show_bug.cgi?id=94770
Reviewed by Adam Barth.
Now m_isolatedWorlds and m_isolatedWorldSecurityOrigins of V8Proxy
are used by ScriptController only. We can move them to ScriptController.
No tests. No change in behavior.
* bindings/v8/ScriptController.cpp:
(WebCore::ScriptController::resetIsolatedWorlds):
(WebCore::ScriptController::evaluateInIsolatedWorld):
(WebCore::ScriptController::setIsolatedWorldSecurityOrigin):
(WebCore::ScriptController::collectIsolatedContexts):
* bindings/v8/ScriptController.h:
(ScriptController):
* bindings/v8/V8Proxy.h:
(V8Proxy):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126388 => 126389)
--- trunk/Source/WebCore/ChangeLog 2012-08-23 03:42:54 UTC (rev 126388)
+++ trunk/Source/WebCore/ChangeLog 2012-08-23 03:46:53 UTC (rev 126389)
@@ -1,5 +1,27 @@
2012-08-22 Kentaro Hara <[email protected]>
+ [V8] Move m_isolatedWorlds and m_isolatedWorldSecurityOrigins from V8Proxy to ScriptController
+ https://bugs.webkit.org/show_bug.cgi?id=94770
+
+ Reviewed by Adam Barth.
+
+ Now m_isolatedWorlds and m_isolatedWorldSecurityOrigins of V8Proxy
+ are used by ScriptController only. We can move them to ScriptController.
+
+ No tests. No change in behavior.
+
+ * bindings/v8/ScriptController.cpp:
+ (WebCore::ScriptController::resetIsolatedWorlds):
+ (WebCore::ScriptController::evaluateInIsolatedWorld):
+ (WebCore::ScriptController::setIsolatedWorldSecurityOrigin):
+ (WebCore::ScriptController::collectIsolatedContexts):
+ * bindings/v8/ScriptController.h:
+ (ScriptController):
+ * bindings/v8/V8Proxy.h:
+ (V8Proxy):
+
+2012-08-22 Kentaro Hara <[email protected]>
+
[V8] Move evaluate() from V8Proxy to ScriptController
https://bugs.webkit.org/show_bug.cgi?id=94768
Modified: trunk/Source/WebCore/bindings/v8/ScriptController.cpp (126388 => 126389)
--- trunk/Source/WebCore/bindings/v8/ScriptController.cpp 2012-08-23 03:42:54 UTC (rev 126388)
+++ trunk/Source/WebCore/bindings/v8/ScriptController.cpp 2012-08-23 03:46:53 UTC (rev 126389)
@@ -155,12 +155,12 @@
void ScriptController::resetIsolatedWorlds()
{
- for (IsolatedWorldMap::iterator iter = m_proxy->isolatedWorlds().begin();
- iter != m_proxy->isolatedWorlds().end(); ++iter) {
+ for (IsolatedWorldMap::iterator iter = m_isolatedWorlds.begin();
+ iter != m_isolatedWorlds.end(); ++iter) {
iter->second->destroy();
}
- m_proxy->isolatedWorlds().clear();
- m_proxy->isolatedWorldSecurityOrigins().clear();
+ m_isolatedWorlds.clear();
+ m_isolatedWorldSecurityOrigins.clear();
}
void ScriptController::clearForClose()
@@ -342,8 +342,8 @@
v8::HandleScope evaluateHandleScope;
V8IsolatedContext* isolatedContext = 0;
if (worldID > 0) {
- IsolatedWorldMap::iterator iter = m_proxy->isolatedWorlds().find(worldID);
- if (iter != m_proxy->isolatedWorlds().end())
+ IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(worldID);
+ if (iter != m_isolatedWorlds.end())
isolatedContext = iter->second;
else {
isolatedContext = new V8IsolatedContext(m_frame, extensionGroup, worldID);
@@ -353,11 +353,11 @@
}
// FIXME: We should change this to using window shells to match JSC.
- m_proxy->isolatedWorlds().set(worldID, isolatedContext);
+ m_isolatedWorlds.set(worldID, isolatedContext);
}
- IsolatedWorldSecurityOriginMap::iterator securityOriginIter = m_proxy->isolatedWorldSecurityOrigins().find(worldID);
- if (securityOriginIter != m_proxy->isolatedWorldSecurityOrigins().end())
+ IsolatedWorldSecurityOriginMap::iterator securityOriginIter = m_isolatedWorldSecurityOrigins.find(worldID);
+ if (securityOriginIter != m_isolatedWorldSecurityOrigins.end())
isolatedContext->setSecurityOrigin(securityOriginIter->second);
} else {
isolatedContext = new V8IsolatedContext(m_frame, extensionGroup, worldID);
@@ -393,9 +393,9 @@
void ScriptController::setIsolatedWorldSecurityOrigin(int worldID, PassRefPtr<SecurityOrigin> securityOrigin)
{
ASSERT(worldID);
- m_proxy->isolatedWorldSecurityOrigins().set(worldID, securityOrigin);
- IsolatedWorldMap::iterator iter = m_proxy->isolatedWorlds().find(worldID);
- if (iter != m_proxy->isolatedWorlds().end())
+ m_isolatedWorldSecurityOrigins.set(worldID, securityOrigin);
+ IsolatedWorldMap::iterator iter = m_isolatedWorlds.find(worldID);
+ if (iter != m_isolatedWorlds.end())
iter->second->setSecurityOrigin(securityOrigin);
}
@@ -662,7 +662,7 @@
void ScriptController::collectIsolatedContexts(Vector<std::pair<ScriptState*, SecurityOrigin*> >& result)
{
v8::HandleScope handleScope;
- for (IsolatedWorldMap::iterator it = m_proxy->isolatedWorlds().begin(); it != m_proxy->isolatedWorlds().end(); ++it) {
+ for (IsolatedWorldMap::iterator it = m_isolatedWorlds.begin(); it != m_isolatedWorlds.end(); ++it) {
V8IsolatedContext* isolatedContext = it->second;
if (!isolatedContext->securityOrigin())
continue;
Modified: trunk/Source/WebCore/bindings/v8/ScriptController.h (126388 => 126389)
--- trunk/Source/WebCore/bindings/v8/ScriptController.h 2012-08-23 03:42:54 UTC (rev 126388)
+++ trunk/Source/WebCore/bindings/v8/ScriptController.h 2012-08-23 03:46:53 UTC (rev 126389)
@@ -218,6 +218,13 @@
// For the moment, we have one of these. Soon we will have one per DOMWrapperWorld.
RefPtr<V8DOMWindowShell> m_windowShell;
+ // The isolated worlds we are tracking for this frame. We hold them alive
+ // here so that they can be used again by future calls to
+ // evaluateInIsolatedWorld().
+ IsolatedWorldMap m_isolatedWorlds;
+
+ IsolatedWorldSecurityOriginMap m_isolatedWorldSecurityOrigins;
+
bool m_paused;
OwnPtr<V8Proxy> m_proxy;
Modified: trunk/Source/WebCore/bindings/v8/V8Proxy.h (126388 => 126389)
--- trunk/Source/WebCore/bindings/v8/V8Proxy.h 2012-08-23 03:42:54 UTC (rev 126388)
+++ trunk/Source/WebCore/bindings/v8/V8Proxy.h 2012-08-23 03:46:53 UTC (rev 126389)
@@ -91,22 +91,8 @@
// FIXME: This method will be soon removed, as all methods that access windowShell()
// will be moved to ScriptController.
V8DOMWindowShell* windowShell() const;
-
- // FIXME: Move m_isolatedWorlds to ScriptController and remove this getter.
- IsolatedWorldMap& isolatedWorlds() { return m_isolatedWorlds; }
-
- // FIXME: Move m_isolatedWorldSecurityOrigins to ScriptController and remove this getter.
- IsolatedWorldSecurityOriginMap& isolatedWorldSecurityOrigins() { return m_isolatedWorldSecurityOrigins; }
-
private:
Frame* m_frame;
-
- // The isolated worlds we are tracking for this frame. We hold them alive
- // here so that they can be used again by future calls to
- // evaluateInIsolatedWorld().
- IsolatedWorldMap m_isolatedWorlds;
-
- IsolatedWorldSecurityOriginMap m_isolatedWorldSecurityOrigins;
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
