Title: [105812] trunk/Source/WebCore
Revision
105812
Author
[email protected]
Date
2012-01-24 14:36:00 -0800 (Tue, 24 Jan 2012)

Log Message

Change dispatchIntent API to pure virtual in FrameLoaderClient.

The Windows compiler needs this to deal with the forward declaration
of WebCore::IntentRequest.
https://bugs.webkit.org/show_bug.cgi?id=76940

Patch by Greg Billock <[email protected]> on 2012-01-24
Reviewed by Adam Barth.

* loader/EmptyClients.h:
(WebCore::EmptyFrameLoaderClient::dispatchIntent):
* loader/FrameLoaderClient.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (105811 => 105812)


--- trunk/Source/WebCore/ChangeLog	2012-01-24 22:31:41 UTC (rev 105811)
+++ trunk/Source/WebCore/ChangeLog	2012-01-24 22:36:00 UTC (rev 105812)
@@ -1,3 +1,17 @@
+2012-01-24  Greg Billock  <[email protected]>
+
+        Change dispatchIntent API to pure virtual in FrameLoaderClient.
+
+        The Windows compiler needs this to deal with the forward declaration
+        of WebCore::IntentRequest.
+        https://bugs.webkit.org/show_bug.cgi?id=76940
+
+        Reviewed by Adam Barth.
+
+        * loader/EmptyClients.h:
+        (WebCore::EmptyFrameLoaderClient::dispatchIntent):
+        * loader/FrameLoaderClient.h:
+
 2012-01-24  Kentaro Hara  <[email protected]>
 
         CodeGeneratorJS.pm should overwrite the output .h/.cpp

Modified: trunk/Source/WebCore/loader/EmptyClients.h (105811 => 105812)


--- trunk/Source/WebCore/loader/EmptyClients.h	2012-01-24 22:31:41 UTC (rev 105811)
+++ trunk/Source/WebCore/loader/EmptyClients.h	2012-01-24 22:36:00 UTC (rev 105812)
@@ -42,6 +42,7 @@
 #include "FrameLoaderClient.h"
 #include "FrameNetworkingContext.h"
 #include "InspectorClient.h"
+#include "IntentRequest.h"
 #include "PopupMenu.h"
 #include "ResourceError.h"
 #include "SearchPopupMenu.h"
@@ -407,6 +408,10 @@
 #endif
 
     virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() { return PassRefPtr<FrameNetworkingContext>(); }
+
+#if ENABLE(WEB_INTENTS)
+    virtual void dispatchIntent(PassRefPtr<IntentRequest>) { }
+#endif
 };
 
 class EmptyTextCheckerClient : public TextCheckerClient {

Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (105811 => 105812)


--- trunk/Source/WebCore/loader/FrameLoaderClient.h	2012-01-24 22:31:41 UTC (rev 105811)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h	2012-01-24 22:36:00 UTC (rev 105812)
@@ -328,7 +328,7 @@
         virtual bool willCheckAndDispatchMessageEvent(SecurityOrigin* /*target*/, MessageEvent*) const { return false; }
 
 #if ENABLE(WEB_INTENTS)
-        virtual void dispatchIntent(PassRefPtr<IntentRequest> intentRequest) { }
+        virtual void dispatchIntent(PassRefPtr<IntentRequest>) = 0;
 #endif
     };
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to