Diff
Modified: trunk/Source/WebCore/ChangeLog (126392 => 126393)
--- trunk/Source/WebCore/ChangeLog 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/ChangeLog 2012-08-23 05:59:23 UTC (rev 126393)
@@ -1,3 +1,41 @@
+2012-08-22 Kentaro Hara <[email protected]>
+
+ [V8] Remove V8Proxy from CodeGeneratorV8.pm
+ https://bugs.webkit.org/show_bug.cgi?id=94773
+
+ Reviewed by Adam Barth.
+
+ To kill V8Proxy, we can remove V8Proxy uses from CodeGeneratorV8.pm.
+
+ No tests. No change in behavior.
+
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateToV8Converters):
+ * bindings/scripts/test/V8/V8Float64Array.cpp:
+ (WebCore::V8Float64Array::wrapSlow):
+ * bindings/scripts/test/V8/V8TestActiveDOMObject.cpp:
+ (WebCore::V8TestActiveDOMObject::wrapSlow):
+ * bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp:
+ (WebCore::V8TestCustomNamedGetter::wrapSlow):
+ * bindings/scripts/test/V8/V8TestEventConstructor.cpp:
+ (WebCore::V8TestEventConstructor::wrapSlow):
+ * bindings/scripts/test/V8/V8TestEventTarget.cpp:
+ (WebCore::V8TestEventTarget::wrapSlow):
+ * bindings/scripts/test/V8/V8TestException.cpp:
+ (WebCore::V8TestException::wrapSlow):
+ * bindings/scripts/test/V8/V8TestInterface.cpp:
+ (WebCore::V8TestInterface::wrapSlow):
+ * bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp:
+ (WebCore::V8TestMediaQueryListListener::wrapSlow):
+ * bindings/scripts/test/V8/V8TestNamedConstructor.cpp:
+ (WebCore::V8TestNamedConstructor::wrapSlow):
+ * bindings/scripts/test/V8/V8TestNode.cpp:
+ (WebCore::V8TestNode::wrapSlow):
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ (WebCore::V8TestObj::wrapSlow):
+ * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
+ (WebCore::V8TestSerializedScriptValueInterface::wrapSlow):
+
2012-08-22 Sukolsak Sakshuwong <[email protected]>
Implement UndoManager's item() method
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-08-23 05:59:23 UTC (rev 126393)
@@ -3352,24 +3352,23 @@
END
}
- my $proxyInit;
+ AddToImplIncludes("Frame.h");
+ my $frame = "0";
if (IsNodeSubType($dataNode)) {
- AddToImplIncludes("Frame.h");
- $proxyInit = "impl->document()->frame() ? impl->document()->frame()->script()->proxy() : 0";
# DocumentType nodes are the only nodes that may have a NULL document.
if ($interfaceName eq "DocumentType") {
- $proxyInit = "impl->document() ? ($proxyInit) : 0";
+ $frame = "impl->document() ? impl->document()->frame() : 0";
+ } else {
+ $frame = "impl->document()->frame()";
}
- } else {
- $proxyInit = "0";
}
push(@implContent, <<END);
- V8Proxy* proxy = $proxyInit;
+ Frame* frame = $frame;
END
if (IsSubType($dataNode, "Document")) {
push(@implContent, <<END);
- if (proxy && proxy->windowShell()->context().IsEmpty() && proxy->windowShell()->initContextIfNeeded()) {
+ if (frame && frame->script()->windowShell()->context().IsEmpty() && frame->script()->windowShell()->initContextIfNeeded()) {
// initContextIfNeeded may have created a wrapper for the object, retry from the start.
return ${className}::wrap(impl.get(), isolate);
}
@@ -3383,8 +3382,8 @@
AddToImplIncludes("Frame.h");
push(@implContent, <<END);
if (impl->frame()) {
- proxy = impl->frame()->script()->proxy();
- proxy->windowShell()->initContextIfNeeded();
+ frame = impl->frame();
+ frame->script()->windowShell()->initContextIfNeeded();
}
END
}
@@ -3394,10 +3393,10 @@
// Enter the node's context and create the wrapper in that context.
v8::Handle<v8::Context> context;
- if (proxy && !proxy->frame()->script()->matchesCurrentContext()) {
+ if (frame && !frame->script()->matchesCurrentContext()) {
// For performance, we enter the context only if the currently running context
// is different from the context that we are about to enter.
- context = proxy->frame()->script()->currentWorldContext();
+ context = frame->script()->currentWorldContext();
if (!context.IsEmpty())
context->Enter();
}
@@ -3405,7 +3404,7 @@
}
push(@implContent, <<END);
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
END
if (IsNodeSubType($dataNode) || IsVisibleAcrossOrigins($dataNode)) {
push(@implContent, <<END);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8Float64Array.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -24,6 +24,7 @@
#include "BindingState.h"
#include "ContextFeatures.h"
#include "ExceptionCode.h"
+#include "Frame.h"
#include "RuntimeEnabledFeatures.h"
#include "V8ArrayBufferView.h"
#include "V8ArrayBufferViewCustom.h"
@@ -151,8 +152,8 @@
{
v8::Handle<v8::Object> wrapper;
ASSERT(static_cast<void*>(static_cast<ArrayBufferView*>(impl.get())) == static_cast<void*>(impl.get()));
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapper, isolate);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestActiveDOMObject.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -180,22 +180,22 @@
v8::Handle<v8::Object> V8TestActiveDOMObject::wrapSlow(PassRefPtr<TestActiveDOMObject> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
+ Frame* frame = 0;
if (impl->frame()) {
- proxy = impl->frame()->script()->proxy();
- proxy->windowShell()->initContextIfNeeded();
+ frame = impl->frame();
+ frame->script()->windowShell()->initContextIfNeeded();
}
// Enter the node's context and create the wrapper in that context.
v8::Handle<v8::Context> context;
- if (proxy && !proxy->frame()->script()->matchesCurrentContext()) {
+ if (frame && !frame->script()->matchesCurrentContext()) {
// For performance, we enter the context only if the currently running context
// is different from the context that we are about to enter.
- context = proxy->frame()->script()->currentWorldContext();
+ context = frame->script()->currentWorldContext();
if (!context.IsEmpty())
context->Enter();
}
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
// Exit the node's context if it was entered.
if (!context.IsEmpty())
context->Exit();
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCustomNamedGetter.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -24,6 +24,7 @@
#include "BindingState.h"
#include "ContextFeatures.h"
#include "ExceptionCode.h"
+#include "Frame.h"
#include "RuntimeEnabledFeatures.h"
#include "V8Binding.h"
#include "V8DOMWrapper.h"
@@ -113,8 +114,8 @@
v8::Handle<v8::Object> V8TestCustomNamedGetter::wrapSlow(PassRefPtr<TestCustomNamedGetter> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapper, isolate);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventConstructor.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -24,6 +24,7 @@
#include "BindingState.h"
#include "ContextFeatures.h"
#include "Dictionary.h"
+#include "Frame.h"
#include "RuntimeEnabledFeatures.h"
#include "V8Binding.h"
#include "V8DOMWrapper.h"
@@ -150,8 +151,8 @@
v8::Handle<v8::Object> V8TestEventConstructor::wrapSlow(PassRefPtr<TestEventConstructor> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapper, isolate);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestEventTarget.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -24,6 +24,7 @@
#include "BindingState.h"
#include "ContextFeatures.h"
#include "ExceptionCode.h"
+#include "Frame.h"
#include "RuntimeEnabledFeatures.h"
#include "V8Binding.h"
#include "V8Collection.h"
@@ -174,8 +175,8 @@
v8::Handle<v8::Object> V8TestEventTarget::wrapSlow(PassRefPtr<TestEventTarget> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapper, isolate);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestException.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestException.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestException.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -23,6 +23,7 @@
#include "BindingState.h"
#include "ContextFeatures.h"
+#include "Frame.h"
#include "RuntimeEnabledFeatures.h"
#include "V8Binding.h"
#include "V8DOMWrapper.h"
@@ -104,8 +105,8 @@
v8::Handle<v8::Object> V8TestException::wrapSlow(PassRefPtr<TestException> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapper, isolate);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -26,6 +26,7 @@
#include "BindingState.h"
#include "ContextFeatures.h"
#include "ExceptionCode.h"
+#include "Frame.h"
#include "RuntimeEnabledFeatures.h"
#include "TestSupplemental.h"
#include "V8Binding.h"
@@ -347,8 +348,8 @@
v8::Handle<v8::Object> V8TestInterface::wrapSlow(PassRefPtr<TestInterface> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForActiveDOMObject(impl, wrapper, isolate);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -24,6 +24,7 @@
#include "BindingState.h"
#include "ContextFeatures.h"
#include "ExceptionCode.h"
+#include "Frame.h"
#include "MediaQueryListListener.h"
#include "RuntimeEnabledFeatures.h"
#include "V8Binding.h"
@@ -113,8 +114,8 @@
v8::Handle<v8::Object> V8TestMediaQueryListListener::wrapSlow(PassRefPtr<TestMediaQueryListListener> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapper, isolate);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNamedConstructor.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -158,8 +158,8 @@
v8::Handle<v8::Object> V8TestNamedConstructor::wrapSlow(PassRefPtr<TestNamedConstructor> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForActiveDOMObject(impl, wrapper, isolate);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNode.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNode.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestNode.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -114,18 +114,18 @@
{
v8::Handle<v8::Object> wrapper;
ASSERT(static_cast<void*>(static_cast<Node*>(impl.get())) == static_cast<void*>(impl.get()));
- V8Proxy* proxy = impl->document()->frame() ? impl->document()->frame()->script()->proxy() : 0;
+ Frame* frame = impl->document()->frame();
// Enter the node's context and create the wrapper in that context.
v8::Handle<v8::Context> context;
- if (proxy && !proxy->frame()->script()->matchesCurrentContext()) {
+ if (frame && !frame->script()->matchesCurrentContext()) {
// For performance, we enter the context only if the currently running context
// is different from the context that we are about to enter.
- context = proxy->frame()->script()->currentWorldContext();
+ context = frame->script()->currentWorldContext();
if (!context.IsEmpty())
context->Enter();
}
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
// Exit the node's context if it was entered.
if (!context.IsEmpty())
context->Exit();
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -26,6 +26,7 @@
#include "DOMStringList.h"
#include "Dictionary.h"
#include "ExceptionCode.h"
+#include "Frame.h"
#include "HTMLNames.h"
#include "IDBBindingUtilities.h"
#include "IDBKey.h"
@@ -2320,8 +2321,8 @@
v8::Handle<v8::Object> V8TestObj::wrapSlow(PassRefPtr<TestObj> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
installPerContextProperties(wrapper, impl.get());
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp (126392 => 126393)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2012-08-23 05:58:10 UTC (rev 126392)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2012-08-23 05:59:23 UTC (rev 126393)
@@ -26,6 +26,7 @@
#include "BindingState.h"
#include "ContextFeatures.h"
#include "ExceptionCode.h"
+#include "Frame.h"
#include "MessagePort.h"
#include "RuntimeEnabledFeatures.h"
#include "SerializedScriptValue.h"
@@ -296,8 +297,8 @@
v8::Handle<v8::Object> V8TestSerializedScriptValueInterface::wrapSlow(PassRefPtr<TestSerializedScriptValueInterface> impl, v8::Isolate* isolate)
{
v8::Handle<v8::Object> wrapper;
- V8Proxy* proxy = 0;
- wrapper = V8DOMWrapper::instantiateV8Object(proxy ? proxy->frame() : 0, &info, impl.get());
+ Frame* frame = 0;
+ wrapper = V8DOMWrapper::instantiateV8Object(frame, &info, impl.get());
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapper, isolate);
