Modified: trunk/Source/WebKit2/ChangeLog (164720 => 164721)
--- trunk/Source/WebKit2/ChangeLog 2014-02-26 18:02:44 UTC (rev 164720)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-26 18:15:14 UTC (rev 164721)
@@ -1,3 +1,16 @@
+2014-02-26 Alexey Proskuryakov <a...@apple.com>
+
+ [iOS] Remove some erroneously captured blocks
+ https://bugs.webkit.org/show_bug.cgi?id=129362
+
+ Reviewed by Sam Weinig.
+
+ Remove unused captured Objective-C block variables (capturing these doesn't work anyway).
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView requestAutocorrectionRectsForString:withCompletionHandler:]):
+ (-[WKContentView requestAutocorrectionContextWithCompletionHandler:]):
+
2014-02-26 Brady Eidson <beid...@apple.com>
Pipe experimental image controls menu up to WebKit2
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (164720 => 164721)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-02-26 18:02:44 UTC (rev 164720)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-02-26 18:15:14 UTC (rev 164721)
@@ -1157,7 +1157,7 @@
}
_autocorrectionData.autocorrectionHandler = [completionHandler copy];
- _page->requestAutocorrectionData(input, AutocorrectionDataCallback::create([self, completionHandler](bool, const Vector<FloatRect>& rects, const String& fontName, double fontSize, uint64_t traits) {
+ _page->requestAutocorrectionData(input, AutocorrectionDataCallback::create([self](bool, const Vector<FloatRect>& rects, const String& fontName, double fontSize, uint64_t traits) {
CGRect firstRect = CGRectZero;
CGRect lastRect = CGRectZero;
if (rects.size()) {
@@ -1214,7 +1214,7 @@
completionHandler([WKAutocorrectionContext autocorrectionContextWithData:beforeText markedText:markedText selectedText:selectedText afterText:afterText selectedRangeInMarkedText:NSMakeRange(location, length)]);
} else {
_autocorrectionData.autocorrectionContextHandler = [completionHandler copy];
- _page->requestAutocorrectionContext(AutocorrectionContextCallback::create([self, completionHandler](bool /*error*/, const String& beforeText, const String& markedText, const String& selectedText, const String& afterText, uint64_t location, uint64_t length) {
+ _page->requestAutocorrectionContext(AutocorrectionContextCallback::create([self](bool /*error*/, const String& beforeText, const String& markedText, const String& selectedText, const String& afterText, uint64_t location, uint64_t length) {
_autocorrectionData.autocorrectionContextHandler([WKAutocorrectionContext autocorrectionContextWithData:beforeText markedText:markedText selectedText:selectedText afterText:afterText selectedRangeInMarkedText:NSMakeRange(location, length)]);
}));
}
