[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
abarth at webkit.org
abarth at webkit.org
Wed Apr 7 23:15:11 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7b9e3d2f4e738ea810c9aa379c35250b54409c70
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 29 20:33:12 2009 +0000
2009-10-29 Adam Barth <abarth at webkit.org>
No review, rolling out r50296.
http://trac.webkit.org/changeset/50296
* bindings/v8/V8IsolatedWorld.cpp:
(WebCore::V8IsolatedWorld::V8IsolatedWorld):
* bindings/v8/V8Proxy.cpp:
(WebCore::V8Proxy::evaluateInIsolatedWorld):
(WebCore::V8Proxy::evaluateInNewContext):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50299 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 305ba9b..a870f9a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,16 @@
2009-10-29 Adam Barth <abarth at webkit.org>
+ No review, rolling out r50296.
+ http://trac.webkit.org/changeset/50296
+
+ * bindings/v8/V8IsolatedWorld.cpp:
+ (WebCore::V8IsolatedWorld::V8IsolatedWorld):
+ * bindings/v8/V8Proxy.cpp:
+ (WebCore::V8Proxy::evaluateInIsolatedWorld):
+ (WebCore::V8Proxy::evaluateInNewContext):
+
+2009-10-29 Adam Barth <abarth at webkit.org>
+
Reviewed by Dimitri Glazkov.
[V8] Out-of-memory crash in isolated worlds
diff --git a/WebCore/bindings/v8/V8IsolatedWorld.cpp b/WebCore/bindings/v8/V8IsolatedWorld.cpp
index d71ec78..d4e4f52 100644
--- a/WebCore/bindings/v8/V8IsolatedWorld.cpp
+++ b/WebCore/bindings/v8/V8IsolatedWorld.cpp
@@ -58,8 +58,6 @@ V8IsolatedWorld::V8IsolatedWorld(V8Proxy* proxy, int extensionGroup)
v8::HandleScope scope;
m_context = SharedPersistent<v8::Context>::create(proxy->createNewContext(v8::Handle<v8::Object>(), extensionGroup));
- if (m_context.IsEmpty())
- return;
// Run code in the new context.
v8::Context::Scope context_scope(m_context->get());
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp
index 2ffb232..1e2100c 100644
--- a/WebCore/bindings/v8/V8Proxy.cpp
+++ b/WebCore/bindings/v8/V8Proxy.cpp
@@ -282,11 +282,6 @@ void V8Proxy::evaluateInIsolatedWorld(int worldID, const Vector<ScriptSourceCode
world = iter->second;
} else {
world = new V8IsolatedWorld(this, extensionGroup);
- if (world->context().IsEmpty()) {
- delete world;
- return;
- }
-
m_isolatedWorlds.set(worldID, world);
// Setup context id for JS debugger.
@@ -294,10 +289,6 @@ void V8Proxy::evaluateInIsolatedWorld(int worldID, const Vector<ScriptSourceCode
}
} else {
world = new V8IsolatedWorld(this, extensionGroup);
- if (world->context().IsEmpty()) {
- delete world;
- return;
- }
}
v8::Local<v8::Context> context = v8::Local<v8::Context>::New(world->context());
@@ -323,9 +314,6 @@ void V8Proxy::evaluateInNewContext(const Vector<ScriptSourceCode>& sources, int
ASSERT(V8DOMWrapper::convertDOMWrapperToNative<DOMWindow>(windowWrapper) == m_frame->domWindow());
v8::Persistent<v8::Context> context = createNewContext(v8::Handle<v8::Object>(), extensionGroup);
- if (context.IsEmpty())
- return;
-
v8::Context::Scope contextScope(context);
// Setup context id for JS debugger.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list