Title: [142629] trunk/Source/WebKit/mac
- Revision
- 142629
- Author
- [email protected]
- Date
- 2013-02-12 08:45:26 -0800 (Tue, 12 Feb 2013)
Log Message
BUILD FIX (r142576): WK1 build fails when ENABLE(DELETION_UI) is off
<https://bugs.webkit.org/show_bug.cgi?id=109534>
Fixes the following build failure:
WebEditorClient.mm:243:23: error: out-of-line definition of 'shouldShowDeleteInterface' does not match any declaration in 'WebEditorClient'
bool WebEditorClient::shouldShowDeleteInterface(HTMLElement* element)
^~~~~~~~~~~~~~~~~~~~~~~~~
* WebCoreSupport/WebEditorClient.mm:
(WebEditorClient::shouldShowDeleteInterface): Protect with
ENABLE(DELETION_UI) macro.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (142628 => 142629)
--- trunk/Source/WebKit/mac/ChangeLog 2013-02-12 16:18:22 UTC (rev 142628)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-02-12 16:45:26 UTC (rev 142629)
@@ -1,3 +1,18 @@
+2013-02-12 David Kilzer <[email protected]>
+
+ BUILD FIX (r142576): WK1 build fails when ENABLE(DELETION_UI) is off
+ <https://bugs.webkit.org/show_bug.cgi?id=109534>
+
+ Fixes the following build failure:
+
+ WebEditorClient.mm:243:23: error: out-of-line definition of 'shouldShowDeleteInterface' does not match any declaration in 'WebEditorClient'
+ bool WebEditorClient::shouldShowDeleteInterface(HTMLElement* element)
+ ^~~~~~~~~~~~~~~~~~~~~~~~~
+
+ * WebCoreSupport/WebEditorClient.mm:
+ (WebEditorClient::shouldShowDeleteInterface): Protect with
+ ENABLE(DELETION_UI) macro.
+
2013-02-11 Ryosuke Niwa <[email protected]>
Disable delete button controller on non-Mac ports and delete EditorClient::shouldShowDeleteInterface
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (142628 => 142629)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2013-02-12 16:18:22 UTC (rev 142628)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2013-02-12 16:45:26 UTC (rev 142629)
@@ -222,11 +222,13 @@
shouldDeleteDOMRange:kit(range)];
}
+#if ENABLE(DELETION_UI)
bool WebEditorClient::shouldShowDeleteInterface(HTMLElement* element)
{
return [[m_webView _editingDelegateForwarder] webView:m_webView
shouldShowDeleteInterfaceForElement:kit(element)];
}
+#endif
bool WebEditorClient::smartInsertDeleteEnabled()
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes