Changeset 210247 in webkit

Timestamp:

Jan 3, 2017 12:53:22 PM (7 years ago)

Author:

dbates@webkit.org

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebViewImpl.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-03  Daniel Bates  <dabates@apple.com>
+
+        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  <dabates@apple.com>
 

trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm

@@ -2984 +2984 @@
         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
 }