Title: [210245] trunk/Source/WebKit2
- Revision
- 210245
- Author
- [email protected]
- Date
- 2017-01-03 12:32:49 -0800 (Tue, 03 Jan 2017)
Log Message
Attempt to fix the Apple Sierra Release 32-bit Build following <https://trac.webkit.org/changeset/210075>
(https://bugs.webkit.org/show_bug.cgi?id=166367)
Add HAVE(TOUCH_BAR)-guard around code that messages candidateListTouchBarItem() as
candidateListTouchBarItem() is only defined when building with Touch Bar support.
Also added an inline comment to help demarcate the code when building without Touch Bar
support. We should look to clean up WebViewImpl.mm including extracting out the Touch
Bar code to another file or better demarcating it so as to improve the hackability of
this code and prevent breaking the build when building without Touch Bar support.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::handleRequestedCandidates):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (210244 => 210245)
--- trunk/Source/WebKit2/ChangeLog 2017-01-03 20:24:36 UTC (rev 210244)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-03 20:32:49 UTC (rev 210245)
@@ -1,3 +1,19 @@
+2017-01-03 Daniel Bates <[email protected]>
+
+ Attempt to fix the Apple Sierra Release 32-bit Build following <https://trac.webkit.org/changeset/210075>
+ (https://bugs.webkit.org/show_bug.cgi?id=166367)
+
+ Add HAVE(TOUCH_BAR)-guard around code that messages candidateListTouchBarItem() as
+ candidateListTouchBarItem() is only defined when building with Touch Bar support.
+
+ Also added an inline comment to help demarcate the code when building without Touch Bar
+ support. We should look to clean up WebViewImpl.mm including extracting out the Touch
+ Bar code to another file or better demarcating it so as to improve the hackability of
+ this code and prevent breaking the build when building without Touch Bar support.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::handleRequestedCandidates):
+
2017-01-03 Michael Catanzaro <[email protected]> and Carlos Garcia Campos <[email protected]>
[GTK] Expose WebKitSecurityOrigin API
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (210244 => 210245)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-01-03 20:24:36 UTC (rev 210244)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-01-03 20:32:49 UTC (rev 210245)
@@ -1195,7 +1195,7 @@
}
} // namespace WebKit
-#else
+#else // !HAVE(TOUCH_BAR)
namespace WebKit {
void WebViewImpl::forceRequestCandidatesForTesting()
@@ -2988,7 +2988,9 @@
WebCore::IntRect offsetSelectionRect = postLayoutData.selectionClipRect;
offsetSelectionRect.move(0, offsetSelectionRect.height());
+#if HAVE(TOUCH_BAR)
[candidateListTouchBarItem() setCandidates:candidates forSelectedRange:selectedRange inString:postLayoutData.paragraphContextForCandidateRequest rect:offsetSelectionRect view:m_view completionHandler:nil];
+#endif
}
static WebCore::TextCheckingResult textCheckingResultFromNSTextCheckingResult(NSTextCheckingResult *nsResult)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
