Diff
Modified: trunk/LayoutTests/ChangeLog (113670 => 113671)
--- trunk/LayoutTests/ChangeLog 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/LayoutTests/ChangeLog 2012-04-10 03:46:03 UTC (rev 113671)
@@ -1,3 +1,15 @@
+2012-04-09 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
ASSERTION FAILED: !attached() in Node::attach.
Deleted: trunk/LayoutTests/webintents/web-intents-invoke-port-expected.txt (113670 => 113671)
--- trunk/LayoutTests/webintents/web-intents-invoke-port-expected.txt 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/LayoutTests/webintents/web-intents-invoke-port-expected.txt 2012-04-10 03:46:03 UTC (rev 113671)
@@ -1,7 +0,0 @@
-Received Web Intent: action="" type=mime/type1
-Have 1 ports
-PASS successfullyParsed is true
-
-TEST COMPLETE
-* sent intent
-
Deleted: trunk/LayoutTests/webintents/web-intents-invoke-port.html (113670 => 113671)
--- trunk/LayoutTests/webintents/web-intents-invoke-port.html 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/LayoutTests/webintents/web-intents-invoke-port.html 2012-04-10 03:46:03 UTC (rev 113671)
@@ -1,34 +0,0 @@
-<html>
- <head>
- <script src=""
- <script src=""
- <script>
- var channel = new MessageChannel();
- channel.port2._onMessage_ = function(e) {
- debug("* got message");
- };
-
- function buttonClicked() {
- try {
- var intent1 = new WebKitIntent("action1", "mime/type1", channel.port1, "not a port");
- testFailed("Should have thrown TypeError");
- } catch (e) {
- if (!(e instanceof TypeError)) testFailed("Should throw type error on non-port arg");
- }
- try {
- var intent1 = new WebKitIntent("action1", "mime/type1", channel.port1, ["not a port"]);
- testFailed("Should have thrown TypeError");
- } catch (e) {
- if (!(e instanceof TypeError)) testFailed("Should throw type error on non-port arg");
- }
-
- navigator.webkitStartActivity(new WebKitIntent("action1", "mime/type1", channel.port1, [channel.port1]));
- debug("* sent intent");
- }
- </script>
- </head>
-<body _onload_="simulateButtonPress()">
-<input type="button" id="button" value="Start Web Intent" _onmouseup_="buttonClicked()">
-<script src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (113670 => 113671)
--- trunk/Source/WebCore/ChangeLog 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebCore/ChangeLog 2012-04-10 03:46:03 UTC (rev 113671)
@@ -1,3 +1,21 @@
+2012-04-09 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
ASSERTION FAILED: !attached() in Node::attach.
Modified: trunk/Source/WebCore/Modules/intents/Intent.cpp (113670 => 113671)
--- trunk/Source/WebCore/Modules/intents/Intent.cpp 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebCore/Modules/intents/Intent.cpp 2012-04-10 03:46:03 UTC (rev 113671)
@@ -32,7 +32,6 @@
#if ENABLE(WEB_INTENTS)
#include "ExceptionCode.h"
-#include "MessagePort.h"
#include "SerializedScriptValue.h"
namespace WebCore {
@@ -51,43 +50,16 @@
return adoptRef(new Intent(action, type, data));
}
-PassRefPtr<Intent> Intent::create(const String& action, const String& type, PassRefPtr<SerializedScriptValue> data, const MessagePortArray& ports, ExceptionCode& ec)
-{
- if (action.isEmpty()) {
- ec = SYNTAX_ERR;
- return 0;
- }
- if (type.isEmpty()) {
- ec = SYNTAX_ERR;
- return 0;
- }
-
- OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(&ports, ec);
-
- return adoptRef(new Intent(action, type, data, channels.release()));
-}
-
Intent::Intent(const String& action, const String& type, PassRefPtr<SerializedScriptValue> data)
: m_action(action)
, m_type(type)
{
if (data)
- m_data = data;
+ m_data = SerializedScriptValue::createFromWire(data->toWireString());
else
m_data = SerializedScriptValue::nullValue();
}
-Intent::Intent(const String& action, const String& type, PassRefPtr<SerializedScriptValue> data, PassOwnPtr<MessagePortChannelArray> ports)
- : m_action(action)
- , m_type(type)
- , m_ports(ports)
-{
- if (data)
- m_data = data;
- else
- m_data = SerializedScriptValue::nullValue();
-}
-
const String& Intent::action() const
{
return m_action;
@@ -103,11 +75,6 @@
return m_data.get();
}
-MessagePortChannelArray* Intent::messagePorts() const
-{
- return m_ports.get();
-}
-
} // namespace WebCore
#endif // ENABLE(WEB_INTENTS)
Modified: trunk/Source/WebCore/Modules/intents/Intent.h (113670 => 113671)
--- trunk/Source/WebCore/Modules/intents/Intent.h 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebCore/Modules/intents/Intent.h 2012-04-10 03:46:03 UTC (rev 113671)
@@ -31,8 +31,6 @@
#if ENABLE(WEB_INTENTS)
-#include "MessagePort.h"
-#include "MessagePortChannel.h"
#include <wtf/Forward.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -48,7 +46,6 @@
class Intent : public RefCounted<Intent> {
public:
static PassRefPtr<Intent> create(const String& action, const String& type, PassRefPtr<SerializedScriptValue> data, ExceptionCode&);
- static PassRefPtr<Intent> create(const String& action, const String& type, PassRefPtr<SerializedScriptValue> data, const MessagePortArray& ports, ExceptionCode&);
const String& action() const;
const String& type() const;
@@ -57,16 +54,12 @@
int identifier() const;
void setIdentifier(int);
- MessagePortChannelArray* messagePorts() const;
-
private:
Intent(const String& action, const String& type, PassRefPtr<SerializedScriptValue> data);
- Intent(const String& action, const String& type, PassRefPtr<SerializedScriptValue> data, PassOwnPtr<MessagePortChannelArray> ports);
String m_action;
String m_type;
RefPtr<SerializedScriptValue> m_data;
- OwnPtr<MessagePortChannelArray> m_ports;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/intents/Intent.idl (113670 => 113671)
--- trunk/Source/WebCore/Modules/intents/Intent.idl 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebCore/Modules/intents/Intent.idl 2012-04-10 03:46:03 UTC (rev 113671)
@@ -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;
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (113670 => 113671)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-04-10 03:46:03 UTC (rev 113671)
@@ -1601,7 +1601,7 @@
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";
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp (113670 => 113671)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2012-04-10 03:46:03 UTC (rev 113671)
@@ -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 <wtf/ArrayBuffer.h>
#include <wtf/UnusedParam.h>
namespace WebCore {
Modified: trunk/Source/WebKit/chromium/ChangeLog (113670 => 113671)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-10 03:46:03 UTC (rev 113671)
@@ -1,3 +1,16 @@
+2012-04-09 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[chromium] More unreviewed OwnPtr<>::operator= related clang build fixes in unit tests.
Modified: trunk/Source/WebKit/chromium/public/WebIntent.h (113670 => 113671)
--- trunk/Source/WebKit/chromium/public/WebIntent.h 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebKit/chromium/public/WebIntent.h 2012-04-10 03:46:03 UTC (rev 113671)
@@ -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 @@
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<WebCore::Intent>&);
#endif
Modified: trunk/Source/WebKit/chromium/src/WebIntent.cpp (113670 => 113671)
--- trunk/Source/WebKit/chromium/src/WebIntent.cpp 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Source/WebKit/chromium/src/WebIntent.cpp 2012-04-10 03:46:03 UTC (rev 113671)
@@ -32,7 +32,6 @@
#include "WebIntent.h"
#include "Intent.h"
-#include "PlatformMessagePortChannel.h"
#include "SerializedScriptValue.h"
namespace WebKit {
@@ -103,21 +102,4 @@
#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
Modified: trunk/Tools/ChangeLog (113670 => 113671)
--- trunk/Tools/ChangeLog 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Tools/ChangeLog 2012-04-10 03:46:03 UTC (rev 113671)
@@ -1,3 +1,15 @@
+2012-04-09 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
Update pywebsocket to 0.7.4.
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (113670 => 113671)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-04-10 03:41:56 UTC (rev 113670)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2012-04-10 03:46:03 UTC (rev 113671)
@@ -1327,14 +1327,7 @@
printf("Received Web Intent: action="" 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 -----------------------------------------------------------
