Changeset 170652 in webkit

Timestamp:

Jul 1, 2014, 11:29:53 AM (12 years ago)

Author:

achristensen@apple.com

Message:

[iOS] Unreviewed build fix after r170640.

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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EditorClient.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/page/EditorClient.h

@@ -180 +180 @@
     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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

@@ -528 +528 @@
 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)

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h

@@ -168 +168 @@
     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

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -1089 +1089 @@
 #endif
 
-#if ENABLE(SERVICE_CONTROLS)
+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
     bool m_serviceControlsEnabled;
 #endif