Make Mac only parts of TelephoneNumberOverlayController PLATFORM(MAC).
authorjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Apr 2014 22:11:16 +0000 (22:11 +0000)
committerjoepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Apr 2014 22:11:16 +0000 (22:11 +0000)
Unreviewed build fix for r166881.

* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::showTelephoneNumberMenu): Deleted.
* WebProcess/WebPage/TelephoneNumberOverlayController.cpp:
(WebKit::TelephoneNumberOverlayController::drawRect):
(WebKit::TelephoneNumberOverlayController::mouseEvent):
* WebProcess/WebPage/TelephoneNumberOverlayController.h:
* WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@166888 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebPageProxy.h
Source/WebKit2/UIProcess/WebPageProxy.messages.in
Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
Source/WebKit2/WebProcess/WebPage/TelephoneNumberOverlayController.cpp
Source/WebKit2/WebProcess/WebPage/TelephoneNumberOverlayController.h
Source/WebKit2/WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm

index c7eb546..774bf90 100644 (file)
@@ -1,3 +1,19 @@
+2014-04-07  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Make Mac only parts of TelephoneNumberOverlayController PLATFORM(MAC).
+
+        Unreviewed build fix for r166881.
+
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::showTelephoneNumberMenu): Deleted.
+        * WebProcess/WebPage/TelephoneNumberOverlayController.cpp:
+        (WebKit::TelephoneNumberOverlayController::drawRect):
+        (WebKit::TelephoneNumberOverlayController::mouseEvent):
+        * WebProcess/WebPage/TelephoneNumberOverlayController.h:
+        * WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm:
+
 2014-04-07  Zan Dobersek  <zdobersek@igalia.com>
 
         Unreviewed. Fixing the GTK build.
index e6c71a2..c4f6ada 100644 (file)
@@ -1228,7 +1228,7 @@ private:
 #endif
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
     void showTelephoneNumberMenu(const String& telephoneNumber, const WebCore::IntPoint&);
 #endif
 #endif
index 00fb18d..ca689dd 100644 (file)
@@ -361,7 +361,7 @@ messages -> WebPageProxy {
 
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
     ShowTelephoneNumberMenu(String telephoneNumber, WebCore::IntPoint point)
 #endif
 #endif
index c0c85de..65868b0 100644 (file)
@@ -647,7 +647,6 @@ void WebPageProxy::openPDFFromTemporaryFolderWithNativeApplication(const String&
 }
 
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
-#if PLATFORM(COCOA)
 void WebPageProxy::showTelephoneNumberMenu(const String& telephoneNumber, const WebCore::IntPoint& point)
 {
     NSArray *menuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForValue:(NSString *)telephoneNumber type:getDDBinderPhoneNumberKey() service:nil context:nil];
@@ -667,7 +666,6 @@ void WebPageProxy::showTelephoneNumberMenu(const String& telephoneNumber, const
     internalShowContextMenu(point, contextData, items, ContextMenuClientEligibility::NotEligibleForClient, nullptr);
 }
 #endif
-#endif
 
 } // namespace WebKit
 
index 4b3296e..41672c0 100644 (file)
@@ -29,6 +29,7 @@
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
 
 #include "WebPage.h"
+#include <WebCore/NotImplemented.h>
 
 using namespace WebCore;
 
@@ -98,6 +99,19 @@ void TelephoneNumberOverlayController::selectedTelephoneNumberRangesChanged(cons
 #endif
 }
 
+#if !PLATFORM(MAC)
+void TelephoneNumberOverlayController::drawRect(PageOverlay*, WebCore::GraphicsContext&, const WebCore::IntRect&)
+{
+    notImplemented();
+}
+
+bool TelephoneNumberOverlayController::mouseEvent(PageOverlay*, const WebMouseEvent&)
+{
+    notImplemented();
+    return false;
+}
+#endif
+
 } // namespace WebKit
 
 #endif // ENABLE(TELEPHONE_NUMBER_DETECTION)
index 9a98d0f..e10cdb9 100644 (file)
@@ -28,6 +28,7 @@
 #if ENABLE(TELEPHONE_NUMBER_DETECTION)
 
 #include "PageOverlay.h"
+#include "WebPage.h"
 #include <WebCore/IntRect.h>
 #include <wtf/RefCounted.h>
 
@@ -39,7 +40,7 @@ namespace WebKit {
     
 class WebPage;
     
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
 typedef void* DDHighlightRef;
 
 class TelephoneNumberData : public RefCounted<TelephoneNumberData> {
@@ -82,8 +83,10 @@ private:
     
     void clearHighlights();
     void clearMouseDownInformation();
-    
+
+#if PLATFORM(MAC)
     void handleTelephoneClick(TelephoneNumberData*, const WebCore::IntPoint&);
+#endif
     
     virtual void pageOverlayDestroyed(PageOverlay*) override;
     virtual void willMoveToWebPage(PageOverlay*, WebPage*) override;
@@ -95,7 +98,7 @@ private:
     PageOverlay* m_telephoneNumberOverlay;
     Vector<RefPtr<WebCore::Range>> m_currentSelectionRanges;
     
-#if PLATFORM(COCOA)
+#if PLATFORM(MAC)
     Vector<RefPtr<TelephoneNumberData>> m_telephoneNumberDatas;
     RefPtr<TelephoneNumberData> m_currentMouseDownNumber;
 #endif
index af79209..cb339a2 100644 (file)
@@ -26,9 +26,8 @@
 #import "config.h"
 #import "TelephoneNumberOverlayController.h"
 
-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
+#if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
 
-#import "WebPage.h"
 #import <WebCore/FrameView.h>
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/MainFrame.h>
@@ -189,4 +188,4 @@ void TelephoneNumberOverlayController::clearHighlights()
     
 }
 
-#endif // ENABLE(TELEPHONE_NUMBER_DETECTION)
+#endif // ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)