Title: [210247] trunk/Source/WebKit2
- Revision
- 210247
- Author
- [email protected]
- Date
- 2017-01-03 12:53:22 -0800 (Tue, 03 Jan 2017)
Log Message
Another 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)
Guard more code in WebViewImpl::handleRequestedCandidates() inside HAVE(TOUCH_BAR).
Remove unused local variable weakThis.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::handleRequestedCandidates):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (210246 => 210247)
--- trunk/Source/WebKit2/ChangeLog 2017-01-03 20:46:08 UTC (rev 210246)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-03 20:53:22 UTC (rev 210247)
@@ -1,5 +1,16 @@
2017-01-03 Daniel Bates <[email protected]>
+ Another 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)
+
+ Guard more code in WebViewImpl::handleRequestedCandidates() inside HAVE(TOUCH_BAR).
+ Remove unused local variable weakThis.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::handleRequestedCandidates):
+
+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)
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (210246 => 210247)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-01-03 20:46:08 UTC (rev 210246)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-01-03 20:53:22 UTC (rev 210247)
@@ -2983,13 +2983,14 @@
if (m_lastStringForCandidateRequest != postLayoutData.stringForCandidateRequest)
return;
+#if HAVE(TOUCH_BAR)
NSRange selectedRange = NSMakeRange(postLayoutData.candidateRequestStartPosition, postLayoutData.selectedTextLength);
- auto weakThis = createWeakPtr();
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];
+#else
+ UNUSED_PARAM(candidates);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
