Title: [170593] tags/Safari-538.43.40/Source/WebKit2
- Revision
- 170593
- Author
- [email protected]
- Date
- 2014-06-30 11:27:22 -0700 (Mon, 30 Jun 2014)
Log Message
Merged r170569. <rdar://problem/17500555>
Modified Paths
Diff
Modified: tags/Safari-538.43.40/Source/WebKit2/ChangeLog (170592 => 170593)
--- tags/Safari-538.43.40/Source/WebKit2/ChangeLog 2014-06-30 18:24:26 UTC (rev 170592)
+++ tags/Safari-538.43.40/Source/WebKit2/ChangeLog 2014-06-30 18:27:22 UTC (rev 170593)
@@ -1,3 +1,17 @@
+2014-06-30 Lucas Forschler <[email protected]>
+
+ Merge r170569
+
+ 2014-06-28 Dan Bernstein <[email protected]>
+
+ 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-26 Lucas Forschler <[email protected]>
Merge r170503
Modified: tags/Safari-538.43.40/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (170592 => 170593)
--- tags/Safari-538.43.40/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-06-30 18:24:26 UTC (rev 170592)
+++ tags/Safari-538.43.40/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-06-30 18:27:22 UTC (rev 170593)
@@ -327,15 +327,12 @@
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();
+ callbackFunction(AttributedString(), EditingRange(), CallbackBase::Error::Unknown);
return;
}
- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(std::move(callbackFunction), std::make_unique<ProcessThrottler::BackgroundActivityToken>(m_process->throttler()));
+ 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);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
