Title: [141995] trunk/Tools
- Revision
- 141995
- Author
- joc...@chromium.org
- Date
- 2013-02-06 06:06:12 -0800 (Wed, 06 Feb 2013)
Log Message
[chromium] fix android build which doesn't support intents
Unreviewed build fix.
* DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
(WebTestRunner::TestRunner::sendWebIntentResponse):
(WebTestRunner::TestRunner::deliverWebIntent):
* DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
(WebTestRunner::WebTestProxyBase::registerIntentService):
(WebTestRunner::WebTestProxyBase::dispatchIntent):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (141994 => 141995)
--- trunk/Tools/ChangeLog 2013-02-06 13:37:23 UTC (rev 141994)
+++ trunk/Tools/ChangeLog 2013-02-06 14:06:12 UTC (rev 141995)
@@ -1,5 +1,18 @@
2013-02-06 Jochen Eisinger <joc...@chromium.org>
+ [chromium] fix android build which doesn't support intents
+
+ Unreviewed build fix.
+
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+ (WebTestRunner::TestRunner::sendWebIntentResponse):
+ (WebTestRunner::TestRunner::deliverWebIntent):
+ * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp:
+ (WebTestRunner::WebTestProxyBase::registerIntentService):
+ (WebTestRunner::WebTestProxyBase::dispatchIntent):
+
+2013-02-06 Jochen Eisinger <joc...@chromium.org>
+
[chromium] turn TestRunner library into a component build
https://bugs.webkit.org/show_bug.cgi?id=108466
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (141994 => 141995)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-02-06 13:37:23 UTC (rev 141994)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-02-06 14:06:12 UTC (rev 141995)
@@ -1716,6 +1716,7 @@
void TestRunner::sendWebIntentResponse(const CppArgumentList& arguments, CppVariant* result)
{
+#ifndef ANDROID
v8::HandleScope scope;
v8::Local<v8::Context> ctx = m_webView->mainFrame()->mainWorldScriptContext();
result->set(m_webView->mainFrame()->selectionAsMarkup().utf8());
@@ -1734,10 +1735,12 @@
request->postFailure(WebSerializedScriptValue::serialize(v8value));
}
result->setNull();
+#endif
}
void TestRunner::deliverWebIntent(const CppArgumentList& arguments, CppVariant* result)
{
+#ifndef ANDROID
if (arguments.size() < 3)
return;
@@ -1754,6 +1757,7 @@
WebIntent intent = WebIntent::create(action, type, serializedData.toString(), WebVector<WebString>(), WebVector<WebString>());
m_webView->mainFrame()->deliverIntent(intent, 0, m_intentClient.get());
+#endif
}
void TestRunner::showWebInspector(const CppArgumentList&, CppVariant* result)
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp (141994 => 141995)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-02-06 13:37:23 UTC (rev 141994)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp 2013-02-06 14:06:12 UTC (rev 141995)
@@ -555,11 +555,14 @@
void WebTestProxyBase::registerIntentService(WebFrame*, const WebIntentServiceInfo& service)
{
+#ifndef ANDROID
m_delegate->printMessage(string("Registered Web Intent Service: action="" + service.action().utf8().data() + " type=" + service.type().utf8().data() + " title=" + service.title().utf8().data() + " url="" + service.url().spec().data() + " disposition=" + service.disposition().utf8().data() + "\n");
+#endif
}
void WebTestProxyBase::dispatchIntent(WebFrame* source, const WebIntentRequest& request)
{
+#ifndef ANDROID
m_delegate->printMessage(string("Received Web Intent: action="" + request.intent().action().utf8().data() + " type=" + request.intent().type().utf8().data() + "\n");
WebMessagePortChannelArray* ports = request.intent().messagePortChannelsRelease();
m_delegate->setCurrentWebIntentRequest(request);
@@ -582,6 +585,7 @@
WebVector<WebURL> suggestions = request.intent().suggestions();
for (size_t i = 0; i < suggestions.size(); ++i)
m_delegate->printMessage(string("Have suggestion ") + suggestions[i].spec().data() + "\n");
+#endif
}
bool WebTestProxyBase::createView(WebFrame*, const WebURLRequest& request, const WebWindowFeatures&, const WebString&, WebNavigationPolicy)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
