Title: [141847] trunk/Tools
- Revision
- 141847
- Author
- [email protected]
- Date
- 2013-02-04 19:42:12 -0800 (Mon, 04 Feb 2013)
Log Message
[chromium] Try to get WebKit building with enable_web_intents set to 0 on Windows too.
https://bugs.webkit.org/show_bug.cgi?id=108887
Reviewed by Kentaro Hara.
This is a follow-up to http://trac.webkit.org/changeset/141614. The
Mac and Linux linkers didn't complain about the reference to
WebIntent in that function for some reason (probably because it's
a dead function that's stripped).
* DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
(WebTestRunner):
* DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
(TestRunner):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (141846 => 141847)
--- trunk/Tools/ChangeLog 2013-02-05 03:30:01 UTC (rev 141846)
+++ trunk/Tools/ChangeLog 2013-02-05 03:42:12 UTC (rev 141847)
@@ -1,3 +1,20 @@
+2013-02-04 Nico Weber <[email protected]>
+
+ [chromium] Try to get WebKit building with enable_web_intents set to 0 on Windows too.
+ https://bugs.webkit.org/show_bug.cgi?id=108887
+
+ Reviewed by Kentaro Hara.
+
+ This is a follow-up to http://trac.webkit.org/changeset/141614. The
+ Mac and Linux linkers didn't complain about the reference to
+ WebIntent in that function for some reason (probably because it's
+ a dead function that's stripped).
+
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+ (WebTestRunner):
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+ (TestRunner):
+
2013-02-04 Julie Parent <[email protected]>
Dashboard cleanup: Make builder a real dashboardSpecificParameter.
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (141846 => 141847)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-02-05 03:30:01 UTC (rev 141846)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-02-05 03:42:12 UTC (rev 141847)
@@ -1744,6 +1744,7 @@
result->setNull();
}
+#if ENABLE(WEB_INTENTS)
void TestRunner::sendWebIntentResponse(const CppArgumentList& arguments, CppVariant* result)
{
v8::HandleScope scope;
@@ -1785,6 +1786,7 @@
m_webView->mainFrame()->deliverIntent(intent, 0, m_intentClient.get());
}
+#endif
void TestRunner::showWebInspector(const CppArgumentList&, CppVariant* result)
{
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h (141846 => 141847)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-02-05 03:30:01 UTC (rev 141846)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-02-05 03:42:12 UTC (rev 141847)
@@ -419,12 +419,14 @@
///////////////////////////////////////////////////////////////////////////
// Methods interacting with the WebTestProxy
+#if ENABLE(WEB_INTENTS)
// Expects one string argument for sending successful result, zero
// arguments for sending a failure result.
void sendWebIntentResponse(const CppArgumentList&, CppVariant*);
// Cause the web intent to be delivered to this context.
void deliverWebIntent(const CppArgumentList&, CppVariant*);
+#endif
///////////////////////////////////////////////////////////////////////////
// Methods forwarding to the WebTestDelegate
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
