From bafb2dbd9f2578e7a72983bc113caafb09ea3c17 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Tue, 10 Apr 2012 03:46:03 +0000 Subject: [PATCH] Unreviewed, rolling out r113656. http://trac.webkit.org/changeset/113656 https://bugs.webkit.org/show_bug.cgi?id=83542 test is broken on chromium-win (Requested by simonjam on #webkit). Patch by Sheriff Bot on 2012-04-09 Source/WebCore: * Modules/intents/Intent.cpp: (WebCore::Intent::Intent): * Modules/intents/Intent.h: (Intent): * Modules/intents/Intent.idl: * bindings/scripts/CodeGeneratorV8.pm: (GenerateParametersCheck): * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp: Source/WebKit/chromium: * public/WebIntent.h: (WebIntent): * src/WebIntent.cpp: Tools: * DumpRenderTree/chromium/WebViewHost.cpp: (WebViewHost::dispatchIntent): LayoutTests: * webintents/web-intents-invoke-port-expected.txt: Removed. * webintents/web-intents-invoke-port.html: Removed. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113671 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 12 ++++++++ .../web-intents-invoke-port-expected.txt | 7 ----- .../webintents/web-intents-invoke-port.html | 34 --------------------- Source/WebCore/ChangeLog | 18 +++++++++++ Source/WebCore/Modules/intents/Intent.cpp | 35 +--------------------- Source/WebCore/Modules/intents/Intent.h | 7 ----- Source/WebCore/Modules/intents/Intent.idl | 2 +- Source/WebCore/bindings/scripts/CodeGeneratorV8.pm | 2 +- .../V8/V8TestSerializedScriptValueInterface.cpp | 2 +- Source/WebKit/chromium/ChangeLog | 13 ++++++++ Source/WebKit/chromium/public/WebIntent.h | 5 ---- Source/WebKit/chromium/src/WebIntent.cpp | 18 ----------- Tools/ChangeLog | 12 ++++++++ Tools/DumpRenderTree/chromium/WebViewHost.cpp | 7 ----- 14 files changed, 59 insertions(+), 115 deletions(-) delete mode 100644 LayoutTests/webintents/web-intents-invoke-port-expected.txt delete mode 100644 LayoutTests/webintents/web-intents-invoke-port.html diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index cb2348d..737f905 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,15 @@ +2012-04-09 Sheriff Bot + + Unreviewed, rolling out r113656. + http://trac.webkit.org/changeset/113656 + https://bugs.webkit.org/show_bug.cgi?id=83542 + + test is broken on chromium-win (Requested by simonjam on + #webkit). + + * webintents/web-intents-invoke-port-expected.txt: Removed. + * webintents/web-intents-invoke-port.html: Removed. + 2012-04-09 Abhishek Arya ASSERTION FAILED: !attached() in Node::attach. diff --git a/LayoutTests/webintents/web-intents-invoke-port-expected.txt b/LayoutTests/webintents/web-intents-invoke-port-expected.txt deleted file mode 100644 index d1b3a92..0000000 --- a/LayoutTests/webintents/web-intents-invoke-port-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -Received Web Intent: action=action1 type=mime/type1 -Have 1 ports -PASS successfullyParsed is true - -TEST COMPLETE -* sent intent - diff --git a/LayoutTests/webintents/web-intents-invoke-port.html b/LayoutTests/webintents/web-intents-invoke-port.html deleted file mode 100644 index 8b72b1a..0000000 --- a/LayoutTests/webintents/web-intents-invoke-port.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 6f009c3..6bbaf80 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,21 @@ +2012-04-09 Sheriff Bot + + Unreviewed, rolling out r113656. + http://trac.webkit.org/changeset/113656 + https://bugs.webkit.org/show_bug.cgi?id=83542 + + test is broken on chromium-win (Requested by simonjam on + #webkit). + + * Modules/intents/Intent.cpp: + (WebCore::Intent::Intent): + * Modules/intents/Intent.h: + (Intent): + * Modules/intents/Intent.idl: + * bindings/scripts/CodeGeneratorV8.pm: + (GenerateParametersCheck): + * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp: + 2012-04-09 Abhishek Arya ASSERTION FAILED: !attached() in Node::attach. diff --git a/Source/WebCore/Modules/intents/Intent.cpp b/Source/WebCore/Modules/intents/Intent.cpp index 053d429..60a3248 100644 --- a/Source/WebCore/Modules/intents/Intent.cpp +++ b/Source/WebCore/Modules/intents/Intent.cpp @@ -32,7 +32,6 @@ #if ENABLE(WEB_INTENTS) #include "ExceptionCode.h" -#include "MessagePort.h" #include "SerializedScriptValue.h" namespace WebCore { @@ -51,39 +50,12 @@ PassRefPtr Intent::create(const String& action, const String& type, Pass return adoptRef(new Intent(action, type, data)); } -PassRefPtr Intent::create(const String& action, const String& type, PassRefPtr data, const MessagePortArray& ports, ExceptionCode& ec) -{ - if (action.isEmpty()) { - ec = SYNTAX_ERR; - return 0; - } - if (type.isEmpty()) { - ec = SYNTAX_ERR; - return 0; - } - - OwnPtr channels = MessagePort::disentanglePorts(&ports, ec); - - return adoptRef(new Intent(action, type, data, channels.release())); -} - Intent::Intent(const String& action, const String& type, PassRefPtr data) : m_action(action) , m_type(type) { if (data) - m_data = data; - else - m_data = SerializedScriptValue::nullValue(); -} - -Intent::Intent(const String& action, const String& type, PassRefPtr data, PassOwnPtr ports) - : m_action(action) - , m_type(type) - , m_ports(ports) -{ - if (data) - m_data = data; + m_data = SerializedScriptValue::createFromWire(data->toWireString()); else m_data = SerializedScriptValue::nullValue(); } @@ -103,11 +75,6 @@ SerializedScriptValue* Intent::data() const return m_data.get(); } -MessagePortChannelArray* Intent::messagePorts() const -{ - return m_ports.get(); -} - } // namespace WebCore #endif // ENABLE(WEB_INTENTS) diff --git a/Source/WebCore/Modules/intents/Intent.h b/Source/WebCore/Modules/intents/Intent.h index 33ef69e..96bebd6 100644 --- a/Source/WebCore/Modules/intents/Intent.h +++ b/Source/WebCore/Modules/intents/Intent.h @@ -31,8 +31,6 @@ #if ENABLE(WEB_INTENTS) -#include "MessagePort.h" -#include "MessagePortChannel.h" #include #include #include @@ -48,7 +46,6 @@ typedef int ExceptionCode; class Intent : public RefCounted { public: static PassRefPtr create(const String& action, const String& type, PassRefPtr data, ExceptionCode&); - static PassRefPtr create(const String& action, const String& type, PassRefPtr data, const MessagePortArray& ports, ExceptionCode&); const String& action() const; const String& type() const; @@ -57,16 +54,12 @@ public: int identifier() const; void setIdentifier(int); - MessagePortChannelArray* messagePorts() const; - private: Intent(const String& action, const String& type, PassRefPtr data); - Intent(const String& action, const String& type, PassRefPtr data, PassOwnPtr ports); String m_action; String m_type; RefPtr m_data; - OwnPtr m_ports; }; } // namespace WebCore diff --git a/Source/WebCore/Modules/intents/Intent.idl b/Source/WebCore/Modules/intents/Intent.idl index ef08250..b3e2369 100644 --- a/Source/WebCore/Modules/intents/Intent.idl +++ b/Source/WebCore/Modules/intents/Intent.idl @@ -26,7 +26,7 @@ module window { interface [ Conditional=WEB_INTENTS, - Constructor(in DOMString action, in DOMString type, in [Optional=DefaultIsNullString, TransferList=transferList] SerializedScriptValue data, in [Optional=DefaultIsUndefined] Array transferList), + Constructor(in DOMString action, in DOMString type, in [Optional=DefaultIsNullString] SerializedScriptValue data), ConstructorRaisesException ] Intent { readonly attribute DOMString action; diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm index a541226..971cfa6 100644 --- a/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm +++ b/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm @@ -1601,7 +1601,7 @@ sub GenerateParametersCheck die "IDL error: TransferList refers to a nonexistent argument"; } - AddToImplIncludes("wtf/ArrayBuffer.h"); + AddToImplIncludes("ArrayBuffer.h"); AddToImplIncludes("MessagePort.h"); $TransferListName = ucfirst($transferListName); $parameterCheckString .= " MessagePortArray messagePortArray$TransferListName;\n"; diff --git a/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp b/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp index bd30b62..22fe288 100644 --- a/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp +++ b/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp @@ -23,6 +23,7 @@ #if ENABLE(Condition1) || ENABLE(Condition2) +#include "ArrayBuffer.h" #include "ExceptionCode.h" #include "MessagePort.h" #include "RuntimeEnabledFeatures.h" @@ -33,7 +34,6 @@ #include "V8DOMWrapper.h" #include "V8IsolatedContext.h" #include "V8Proxy.h" -#include #include namespace WebCore { diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog index c014646..eae55ef 100644 --- a/Source/WebKit/chromium/ChangeLog +++ b/Source/WebKit/chromium/ChangeLog @@ -1,3 +1,16 @@ +2012-04-09 Sheriff Bot + + Unreviewed, rolling out r113656. + http://trac.webkit.org/changeset/113656 + https://bugs.webkit.org/show_bug.cgi?id=83542 + + test is broken on chromium-win (Requested by simonjam on + #webkit). + + * public/WebIntent.h: + (WebIntent): + * src/WebIntent.cpp: + 2012-04-09 James Robinson [chromium] More unreviewed OwnPtr<>::operator= related clang build fixes in unit tests. diff --git a/Source/WebKit/chromium/public/WebIntent.h b/Source/WebKit/chromium/public/WebIntent.h index 73a6213..d01098f 100644 --- a/Source/WebKit/chromium/public/WebIntent.h +++ b/Source/WebKit/chromium/public/WebIntent.h @@ -31,11 +31,9 @@ #ifndef WebIntent_h #define WebIntent_h -#include "WebMessagePortChannel.h" #include "platform/WebCommon.h" #include "platform/WebPrivatePtr.h" #include "platform/WebString.h" -#include "platform/WebVector.h" namespace WebCore { class Intent; } @@ -64,9 +62,6 @@ public: WEBKIT_EXPORT WebString type() const; WEBKIT_EXPORT WebString data() const; - // Caller takes ownership of the ports. - WEBKIT_EXPORT WebMessagePortChannelArray* messagePortChannelsRelease() const; - #if WEBKIT_IMPLEMENTATION WebIntent(const WTF::PassRefPtr&); #endif diff --git a/Source/WebKit/chromium/src/WebIntent.cpp b/Source/WebKit/chromium/src/WebIntent.cpp index 8a7d6aa..77d766d 100644 --- a/Source/WebKit/chromium/src/WebIntent.cpp +++ b/Source/WebKit/chromium/src/WebIntent.cpp @@ -32,7 +32,6 @@ #include "WebIntent.h" #include "Intent.h" -#include "PlatformMessagePortChannel.h" #include "SerializedScriptValue.h" namespace WebKit { @@ -103,21 +102,4 @@ WebString WebIntent::data() const #endif } -WebMessagePortChannelArray* WebIntent::messagePortChannelsRelease() const -{ - // Note: see PlatformMessagePortChannel::postMessageToRemote. - WebMessagePortChannelArray* webChannels = 0; - WebCore::MessagePortChannelArray* messagePorts = m_private->messagePorts(); - if (messagePorts) { - webChannels = new WebMessagePortChannelArray(messagePorts->size()); - for (size_t i = 0; i < messagePorts->size(); ++i) { - WebCore::PlatformMessagePortChannel* platformChannel = messagePorts->at(i)->channel(); - (*webChannels)[i] = platformChannel->webChannelRelease(); - (*webChannels)[i]->setClient(0); - } - } - - return webChannels; -} - } // namespace WebKit diff --git a/Tools/ChangeLog b/Tools/ChangeLog index bd34303..d4641ea 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2012-04-09 Sheriff Bot + + Unreviewed, rolling out r113656. + http://trac.webkit.org/changeset/113656 + https://bugs.webkit.org/show_bug.cgi?id=83542 + + test is broken on chromium-win (Requested by simonjam on + #webkit). + + * DumpRenderTree/chromium/WebViewHost.cpp: + (WebViewHost::dispatchIntent): + 2012-04-09 Takashi Toyoshima Update pywebsocket to 0.7.4. diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp index 60af416..b3e9dda 100644 --- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp +++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp @@ -1327,14 +1327,7 @@ void WebViewHost::dispatchIntent(WebFrame* source, const WebIntentRequest& reque printf("Received Web Intent: action=%s type=%s\n", request.intent().action().utf8().data(), request.intent().type().utf8().data()); - WebMessagePortChannelArray* ports = request.intent().messagePortChannelsRelease(); m_currentRequest = request; - if (ports) { - printf("Have %zu ports\n", ports->size()); - for (size_t i = 0; i < ports->size(); ++i) - (*ports)[i]->destroy(); - delete ports; - } } // Public functions ----------------------------------------------------------- -- 2.7.4