Title: [170652] trunk/Source
- Revision
- 170652
- Author
- [email protected]
- Date
- 2014-07-01 11:29:53 -0700 (Tue, 01 Jul 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170651 => 170652)
--- trunk/Source/WebCore/ChangeLog 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 18:29:53 UTC (rev 170652)
@@ -1,3 +1,11 @@
+2014-07-01 Alex Christensen <[email protected]>
+
+ [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 <[email protected]>
Remove unnecessary calls to std::move()
Modified: trunk/Source/WebCore/page/EditorClient.h (170651 => 170652)
--- trunk/Source/WebCore/page/EditorClient.h 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebCore/page/EditorClient.h 2014-07-01 18:29:53 UTC (rev 170652)
@@ -179,11 +179,8 @@
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
Modified: trunk/Source/WebKit2/ChangeLog (170651 => 170652)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 18:29:53 UTC (rev 170652)
@@ -1,3 +1,14 @@
+2014-07-01 Alex Christensen <[email protected]>
+
+ [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 <[email protected]>
Add WKSessionStateGetTypeID
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (170651 => 170652)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-07-01 18:29:53 UTC (rev 170652)
@@ -527,12 +527,16 @@
#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)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (170651 => 170652)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-07-01 18:29:53 UTC (rev 170652)
@@ -167,10 +167,8 @@
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
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (170651 => 170652)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-01 18:29:53 UTC (rev 170652)
@@ -1088,7 +1088,7 @@
RunLoop::Timer<WebPage> m_determinePrimarySnapshottedPlugInTimer;
#endif
-#if ENABLE(SERVICE_CONTROLS)
+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
bool m_serviceControlsEnabled;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
