Diff
Modified: trunk/LayoutTests/ChangeLog (109068 => 109069)
--- trunk/LayoutTests/ChangeLog 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/ChangeLog 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,3 +1,20 @@
+2012-02-27 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r109041.
+ http://trac.webkit.org/changeset/109041
+ https://bugs.webkit.org/show_bug.cgi?id=79741
+
+ Broke Chromium Win build (Requested by bashi on #webkit).
+
+ * webintents/resources/web-intents-testing.js: Removed.
+ * webintents/web-intents-failure-expected.txt: Removed.
+ * webintents/web-intents-failure.html: Removed.
+ * webintents/web-intents-invoke-expected.txt: Removed.
+ * webintents/web-intents-invoke.html: Removed.
+ * webintents/web-intents-reload.html:
+ * webintents/web-intents-reply-expected.txt: Removed.
+ * webintents/web-intents-reply.html: Removed.
+
2012-02-27 Huang Dongsung <luxte...@company100.net>
Fixed a typo in CanvasRenderingContext2D::drawImage(HTMLCanvasElement);
Deleted: trunk/LayoutTests/webintents/resources/web-intents-testing.js (109068 => 109069)
--- trunk/LayoutTests/webintents/resources/web-intents-testing.js 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/webintents/resources/web-intents-testing.js 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,40 +0,0 @@
-// Callback function to be used for a successful web intent call.
-function onSuccess(data) {
- debug("* got reply: " + data);
-
- if (window.layoutTestController) {
- window.layoutTestController.notifyDone();
- }
-}
-
-// Callback function to be used for a failed web intent call.
-function onFailure(data) {
- debug("* got failure: " + data);
-
- if (window.layoutTestController) {
- window.layoutTestController.notifyDone();
- }
-}
-
-// Launch a web intent call with callbacks.
-function startIntentWithCallbacks() {
- navigator.startActivity(new Intent("action1", "mime/type1", "test"), onSuccess, onFailure);
- debug("* sent intent");
-
- if (window.layoutTestController) {
- window.layoutTestController.waitUntilDone();
- } else {
- alert('This test needs to run in DRT');
- }
-}
-
-// This button press simulator sets the user gesture indicator that an intent
-// requires to start.
-function simulateButtonPress() {
- var button = document.getElementById("button");
- if (eventSender) {
- eventSender.mouseMoveTo(button.getBoundingClientRect().left + 2, button.getBoundingClientRect().top + 12);
- eventSender.mouseDown();
- eventSender.mouseUp();
- }
-}
Deleted: trunk/LayoutTests/webintents/web-intents-failure-expected.txt (109068 => 109069)
--- trunk/LayoutTests/webintents/web-intents-failure-expected.txt 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/webintents/web-intents-failure-expected.txt 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,7 +0,0 @@
-Received Web Intent: action="" type=mime/type1
-PASS successfullyParsed is true
-
-TEST COMPLETE
-* sent intent
-* got failure: ERROR
-
Deleted: trunk/LayoutTests/webintents/web-intents-failure.html (109068 => 109069)
--- trunk/LayoutTests/webintents/web-intents-failure.html 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/webintents/web-intents-failure.html 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,20 +0,0 @@
-<html>
- <head>
- <script src=""
- <script src=""
- <script>
- function buttonClicked() {
- startIntentWithCallbacks();
-
- if (window.layoutTestController) {
- // Empty args will send failure message.
- window.layoutTestController.sendWebIntentResponse();
- }
- }
- </script>
- </head>
-<body _onload_="simulateButtonPress()">
-<input type="button" id="button" value="Start Web Intent" _onmouseup_="buttonClicked()">
-<script src=""
-</body>
-</html>
Deleted: trunk/LayoutTests/webintents/web-intents-invoke-expected.txt (109068 => 109069)
--- trunk/LayoutTests/webintents/web-intents-invoke-expected.txt 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/webintents/web-intents-invoke-expected.txt 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,6 +0,0 @@
-Received Web Intent: action="" type=mime/type1
-PASS successfullyParsed is true
-
-TEST COMPLETE
-* sent intent
-
Deleted: trunk/LayoutTests/webintents/web-intents-invoke.html (109068 => 109069)
--- trunk/LayoutTests/webintents/web-intents-invoke.html 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/webintents/web-intents-invoke.html 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,16 +0,0 @@
-<html>
- <head>
- <script src=""
- <script src=""
- <script>
- function buttonClicked() {
- navigator.startActivity(new Intent("action1", "mime/type1", "test"));
- 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/LayoutTests/webintents/web-intents-reload.html (109068 => 109069)
--- trunk/LayoutTests/webintents/web-intents-reload.html 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/webintents/web-intents-reload.html 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,7 +1,6 @@
<html>
<head>
<script src=""
- <script src=""
<script>
var latch = true;
@@ -27,14 +26,19 @@
if (window.layoutTestController) {
window.layoutTestController.waitUntilDone();
window.layoutTestController.dumpChildFramesAsText();
- } else {
- alert('This test needs to run in DRT');
}
debug("* loaded");
- simulateButtonPress();
- debug("* sent mouseup");
+ // We must simulate a button press with eventSender because intents
+ // require a user gesture.
+ var button = document.getElementById("button");
+ if (eventSender) {
+ eventSender.mouseMoveTo(button.getBoundingClientRect().left + 2, button.getBoundingClientRect().top + 12);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ debug("* sent mouseup");
+ }
}
</script>
</head>
Deleted: trunk/LayoutTests/webintents/web-intents-reply-expected.txt (109068 => 109069)
--- trunk/LayoutTests/webintents/web-intents-reply-expected.txt 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/webintents/web-intents-reply-expected.txt 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,7 +0,0 @@
-Received Web Intent: action="" type=mime/type1
-PASS successfullyParsed is true
-
-TEST COMPLETE
-* sent intent
-* got reply: reply
-
Deleted: trunk/LayoutTests/webintents/web-intents-reply.html (109068 => 109069)
--- trunk/LayoutTests/webintents/web-intents-reply.html 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/LayoutTests/webintents/web-intents-reply.html 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,19 +0,0 @@
-<html>
- <head>
- <script src=""
- <script src=""
- <script>
- function buttonClicked() {
- startIntentWithCallbacks();
-
- if (window.layoutTestController) {
- window.layoutTestController.sendWebIntentResponse("reply");
- }
- }
- </script>
- </head>
-<body _onload_="simulateButtonPress()">
-<input type="button" id="button" value="Start Web Intent" _onmouseup_="buttonClicked()">
-<script src=""
-</body>
-</html>
Modified: trunk/Tools/ChangeLog (109068 => 109069)
--- trunk/Tools/ChangeLog 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/Tools/ChangeLog 2012-02-28 04:50:08 UTC (rev 109069)
@@ -1,3 +1,17 @@
+2012-02-27 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r109041.
+ http://trac.webkit.org/changeset/109041
+ https://bugs.webkit.org/show_bug.cgi?id=79741
+
+ Broke Chromium Win build (Requested by bashi on #webkit).
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp:
+ (LayoutTestController::LayoutTestController):
+ * DumpRenderTree/chromium/LayoutTestController.h:
+ (LayoutTestController):
+ * DumpRenderTree/chromium/WebViewHost.h:
+
2012-02-27 James Robinson <jam...@chromium.org>
[chromium] Remove media tests from ChromiumGpu configurations
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp (109068 => 109069)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2012-02-28 04:50:08 UTC (rev 109069)
@@ -49,19 +49,16 @@
#include "WebGeolocationClientMock.h"
#include "WebIDBFactory.h"
#include "WebInputElement.h"
-#include "WebIntentRequest.h"
#include "WebKit.h"
#include "WebNotificationPresenter.h"
#include "WebPermissions.h"
#include "WebScriptSource.h"
#include "WebSecurityPolicy.h"
-#include "platform/WebSerializedScriptValue.h"
#include "WebSettings.h"
#include "platform/WebSize.h"
#include "platform/WebURL.h"
#include "WebView.h"
#include "WebViewHost.h"
-#include "v8/include/v8.h"
#include "webkit/support/webkit_support.h"
#include <algorithm>
#include <cctype>
@@ -265,7 +262,6 @@
bindProperty("platformName", &m_platformName);
bindProperty("interceptPostMessage", &m_interceptPostMessage);
bindProperty("workerThreadCount", &LayoutTestController::workerThreadCount);
- bindMethod("sendWebIntentResponse", &LayoutTestController::sendWebIntentResponse);
}
LayoutTestController::~LayoutTestController()
@@ -2130,28 +2126,6 @@
result->set(static_cast<int>(WebWorkerInfo::dedicatedWorkerCount()));
}
-void LayoutTestController::sendWebIntentResponse(const CppArgumentList& arguments, CppVariant* result)
-{
- v8::HandleScope scope;
- v8::Local<v8::Context> ctx = m_shell->webView()->mainFrame()->mainWorldScriptContext();
- result->set(m_shell->webView()->mainFrame()->selectionAsMarkup().utf8());
- v8::Context::Scope cscope(ctx);
-
- WebKit::WebIntentRequest* request = m_shell->webViewHost()->currentIntentRequest();
- if (request->isNull())
- return;
-
- if (arguments.size() == 1) {
- WebKit::WebString reply = cppVariantToWebString(arguments[0]);
- v8::Handle<v8::Value> v8value = v8::String::New(reply.data(), reply.length());
- request->postResult(WebKit::WebSerializedScriptValue::serialize(v8value));
- } else {
- v8::Handle<v8::Value> v8value = v8::String::New("ERROR");
- request->postFailure(WebKit::WebSerializedScriptValue::serialize(v8value));
- }
- result->setNull();
-}
-
void LayoutTestController::setPluginsEnabled(const CppArgumentList& arguments, CppVariant* result)
{
if (arguments.size() > 0 && arguments[0].isBool()) {
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h (109068 => 109069)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h 2012-02-28 04:50:08 UTC (rev 109069)
@@ -437,10 +437,6 @@
void workerThreadCount(CppVariant*);
- // Expects one string argument for sending successful result, zero
- // for sending a failure result.
- void sendWebIntentResponse(const CppArgumentList&, CppVariant*);
-
public:
// The following methods are not exposed to _javascript_.
void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (109068 => 109069)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-02-28 04:41:18 UTC (rev 109068)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2012-02-28 04:50:08 UTC (rev 109069)
@@ -252,9 +252,6 @@
// Pending task list, Note taht the method is referred from MethodTask class.
TaskList* taskList() { return &m_taskList; }
- // The current web intents request.
- WebKit::WebIntentRequest* currentIntentRequest() { return &m_currentRequest; }
-
private:
class HostMethodTask : public MethodTask<WebViewHost> {
