Title: [125279] trunk/Source/WebCore
- Revision
- 125279
- Author
- hara...@chromium.org
- Date
- 2012-08-10 08:16:22 -0700 (Fri, 10 Aug 2012)
Log Message
[V8] Remove collectIsolatedContexts() from V8Proxy
https://bugs.webkit.org/show_bug.cgi?id=93682
Reviewed by Adam Barth.
We want to remove V8Proxy. This patch removes V8Proxy::collectIsolatedContexts().
No tests. No change in behavior.
* bindings/v8/ScriptController.cpp:
(WebCore::ScriptController::collectIsolatedContexts):
* bindings/v8/V8Proxy.cpp:
(WebCore::V8Proxy::collectIsolatedContexts):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125278 => 125279)
--- trunk/Source/WebCore/ChangeLog 2012-08-10 14:12:43 UTC (rev 125278)
+++ trunk/Source/WebCore/ChangeLog 2012-08-10 15:16:22 UTC (rev 125279)
@@ -1,3 +1,19 @@
+2012-08-10 Kentaro Hara <hara...@chromium.org>
+
+ [V8] Remove collectIsolatedContexts() from V8Proxy
+ https://bugs.webkit.org/show_bug.cgi?id=93682
+
+ Reviewed by Adam Barth.
+
+ We want to remove V8Proxy. This patch removes V8Proxy::collectIsolatedContexts().
+
+ No tests. No change in behavior.
+
+ * bindings/v8/ScriptController.cpp:
+ (WebCore::ScriptController::collectIsolatedContexts):
+ * bindings/v8/V8Proxy.cpp:
+ (WebCore::V8Proxy::collectIsolatedContexts):
+
2012-08-10 Simon Hausmann <simon.hausm...@nokia.com>
[Qt] Unreviewed trivial build fix: Avoid passing a non-existance WebCore/websockets directory
Modified: trunk/Source/WebCore/bindings/v8/ScriptController.cpp (125278 => 125279)
--- trunk/Source/WebCore/bindings/v8/ScriptController.cpp 2012-08-10 14:12:43 UTC (rev 125278)
+++ trunk/Source/WebCore/bindings/v8/ScriptController.cpp 2012-08-10 15:16:22 UTC (rev 125279)
@@ -442,7 +442,17 @@
void ScriptController::collectIsolatedContexts(Vector<std::pair<ScriptState*, SecurityOrigin*> >& result)
{
- m_proxy->collectIsolatedContexts(result);
+ v8::HandleScope handleScope;
+ for (IsolatedWorldMap::iterator it = m_proxy->isolatedWorlds().begin(); it != m_proxy->isolatedWorlds().end(); ++it) {
+ V8IsolatedContext* isolatedContext = it->second;
+ if (!isolatedContext->securityOrigin())
+ continue;
+ v8::Handle<v8::Context> v8Context = isolatedContext->context();
+ if (v8Context.IsEmpty())
+ continue;
+ ScriptState* scriptState = ScriptState::forContext(v8::Local<v8::Context>::New(v8Context));
+ result.append(std::pair<ScriptState*, SecurityOrigin*>(scriptState, isolatedContext->securityOrigin()));
+ }
}
#endif
Modified: trunk/Source/WebCore/bindings/v8/V8Proxy.cpp (125278 => 125279)
--- trunk/Source/WebCore/bindings/v8/V8Proxy.cpp 2012-08-10 14:12:43 UTC (rev 125278)
+++ trunk/Source/WebCore/bindings/v8/V8Proxy.cpp 2012-08-10 15:16:22 UTC (rev 125279)
@@ -666,21 +666,6 @@
return atoi(comma + 1);
}
-void V8Proxy::collectIsolatedContexts(Vector<std::pair<ScriptState*, SecurityOrigin*> >& result)
-{
- v8::HandleScope handleScope;
- for (IsolatedWorldMap::iterator it = m_isolatedWorlds.begin(); it != m_isolatedWorlds.end(); ++it) {
- V8IsolatedContext* isolatedContext = it->second;
- if (!isolatedContext->securityOrigin())
- continue;
- v8::Handle<v8::Context> v8Context = isolatedContext->context();
- if (v8Context.IsEmpty())
- continue;
- ScriptState* scriptState = ScriptState::forContext(v8::Local<v8::Context>::New(v8Context));
- result.append(std::pair<ScriptState*, SecurityOrigin*>(scriptState, isolatedContext->securityOrigin()));
- }
-}
-
v8::Local<v8::Context> toV8Context(ScriptExecutionContext* context, const WorldContextHandle& worldContext)
{
if (context->isDocument()) {
Modified: trunk/Source/WebCore/bindings/v8/V8Proxy.h (125278 => 125279)
--- trunk/Source/WebCore/bindings/v8/V8Proxy.h 2012-08-10 14:12:43 UTC (rev 125278)
+++ trunk/Source/WebCore/bindings/v8/V8Proxy.h 2012-08-10 15:16:22 UTC (rev 125279)
@@ -170,7 +170,6 @@
bool setContextDebugId(int id);
static int contextDebugId(v8::Handle<v8::Context>);
- void collectIsolatedContexts(Vector<std::pair<ScriptState*, SecurityOrigin*> >&);
// Registers a v8 extension to be available on webpages. Will only
// affect v8 contexts initialized after this call. Takes ownership of
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
