[iOS] Unreviewed build fix after r170640.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Jul 2014 18:29:53 +0000 (18:29 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Jul 2014 18:29:53 +0000 (18:29 +0000)
Source/WebCore:
* page/EditorClient.h:
(WebCore::EditorClient::selectedTelephoneNumberRangesChanged):
Add ifdefs to make everything compile and link.

Source/WebKit2:
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::selectedTelephoneNumberRangesChanged):
(WebKit::WebEditorClient::selectionRectsDidChange):
* WebProcess/WebCoreSupport/WebEditorClient.h:
* WebProcess/WebPage/WebPage.h:
Add ifdefs to make everything compile and link.

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

Source/WebCore/ChangeLog
Source/WebCore/page/EditorClient.h
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
Source/WebKit2/WebProcess/WebPage/WebPage.h

index e47ef88..b245894 100644 (file)
@@ -1,3 +1,11 @@
+2014-07-01  Alex Christensen  <achristensen@webkit.org>
+
+        [iOS] Unreviewed build fix after r170640.
+
+        * page/EditorClient.h:
+        (WebCore::EditorClient::selectedTelephoneNumberRangesChanged):
+        Add ifdefs to make everything compile and link.
+
 2014-07-01  Daniel Bates  <dabates@apple.com>
 
         Remove unnecessary calls to std::move()
index ff9554b..1159621 100644 (file)
@@ -179,11 +179,8 @@ public:
     virtual void willSetInputMethodState() = 0;
     virtual void setInputMethodState(bool enabled) = 0;
 
-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
     virtual void selectedTelephoneNumberRangesChanged(const Vector<RefPtr<Range>>&) { }
-#endif
-
-#if ENABLE(SERVICE_CONTROLS)
     virtual void selectionRectsDidChange(const Vector<LayoutRect>&) { }
 #endif
 
index c3fc6a3..e4c25fe 100644 (file)
@@ -1,3 +1,14 @@
+2014-07-01  Alex Christensen  <achristensen@webkit.org>
+
+        [iOS] Unreviewed build fix after r170640.
+
+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+        (WebKit::WebEditorClient::selectedTelephoneNumberRangesChanged):
+        (WebKit::WebEditorClient::selectionRectsDidChange):
+        * WebProcess/WebCoreSupport/WebEditorClient.h:
+        * WebProcess/WebPage/WebPage.h:
+        Add ifdefs to make everything compile and link.
+
 2014-07-01  Anders Carlsson  <andersca@apple.com>
 
         Add WKSessionStateGetTypeID
index d9c000a..d7d649d 100644 (file)
@@ -527,12 +527,16 @@ bool WebEditorClient::supportsGlobalSelection()
 #if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
 void WebEditorClient::selectedTelephoneNumberRangesChanged(const Vector<RefPtr<Range>>& ranges)
 {
+#if PLATFORM(MAC)
     m_page->servicesOverlayController().selectedTelephoneNumberRangesChanged(ranges);
+#endif
 }
 void WebEditorClient::selectionRectsDidChange(const Vector<LayoutRect>& rects)
 {
+#if PLATFORM(MAC)
     if (m_page->serviceControlsEnabled())
         m_page->servicesOverlayController().selectionRectsDidChange(rects);
+#endif
 }
 #endif // ENABLE(SERVICE_CONTROLS) && ENABLE(TELEPHONE_NUMBER_DETECTION)
 
index a88b60c..083b599 100644 (file)
@@ -167,10 +167,8 @@ private:
 
     virtual bool supportsGlobalSelection() override;
 
-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
+#if ENABLE(TELEPHONE_NUMBER_DETECTION) || ENABLE(SERVICE_CONTROLS)
     virtual void selectedTelephoneNumberRangesChanged(const Vector<RefPtr<WebCore::Range>>&) override;
-#endif
-#if ENABLE(SERVICE_CONTROLS)
     virtual void selectionRectsDidChange(const Vector<WebCore::LayoutRect>&) override;
 #endif
 
index e0ee60b..d312ae7 100644 (file)
@@ -1088,7 +1088,7 @@ private:
     RunLoop::Timer<WebPage> m_determinePrimarySnapshottedPlugInTimer;
 #endif
 
-#if ENABLE(SERVICE_CONTROLS)
+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
     bool m_serviceControlsEnabled;
 #endif