Changeset 170569 in webkit

Timestamp:

Jun 28, 2014, 3:31:26 PM (11 years ago)

Author:

mitz@apple.com

Message:

REGRESSION: WebPageProxy::attributedSubstringForCharacterRangeAsync never calls its callback function
​https://bugs.webkit.org/show_bug.cgi?id=134429

Reviewed by Tim Horton.

• UIProcess/mac/WebPageProxyMac.mm:

(WebKit::WebPageProxy::attributedSubstringForCharacterRangeAsync):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WebPageProxyMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-06-28  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION: WebPageProxy::attributedSubstringForCharacterRangeAsync never calls its callback function
+        https://bugs.webkit.org/show_bug.cgi?id=134429
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/mac/WebPageProxyMac.mm:
+        (WebKit::WebPageProxy::attributedSubstringForCharacterRangeAsync):
+
 2014-06-27  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm

@@ -328 +328 @@
 void WebPageProxy::attributedSubstringForCharacterRangeAsync(const EditingRange& range, std::function<void (const AttributedString&, const EditingRange&, CallbackBase::Error)> callbackFunction)
 {
-    RefPtr<AttributedStringForCharacterRangeCallback> callback = AttributedStringForCharacterRangeCallback::create(std::move(callbackFunction));
-
     if (!isValid()) {
-        callback->invalidate();
-        return;
-    }
-
-    uint64_t callbackID = callback->callbackID();
-    m_callbacks.put(std::move(callbackFunction), std::make_unique<ProcessThrottler::BackgroundActivityToken>(m_process->throttler()));
+        callbackFunction(AttributedString(), EditingRange(), CallbackBase::Error::Unknown);
+        return;
+    }
+
+    uint64_t callbackID = m_callbacks.put(std::move(callbackFunction), std::make_unique<ProcessThrottler::BackgroundActivityToken>(m_process->throttler()));
 
     process().send(Messages::WebPage::AttributedSubstringForCharacterRangeAsync(range, callbackID), m_pageID);