Title: [191528] trunk/Source/WebKit2
- Revision
- 191528
- Author
- [email protected]
- Date
- 2015-10-23 18:11:36 -0700 (Fri, 23 Oct 2015)
Log Message
Fix CMake compile error and add correct null check
https://bugs.webkit.org/show_bug.cgi?id=150520
Patch by Alex Christensen <[email protected]> on 2015-10-23
Reviewed by Simon Fraser.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _doAfterNextPresentationUpdate:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191527 => 191528)
--- trunk/Source/WebKit2/ChangeLog 2015-10-24 01:01:11 UTC (rev 191527)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-24 01:11:36 UTC (rev 191528)
@@ -1,5 +1,15 @@
2015-10-23 Alex Christensen <[email protected]>
+ Fix CMake compile error and add correct null check
+ https://bugs.webkit.org/show_bug.cgi?id=150520
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _doAfterNextPresentationUpdate:]):
+
+2015-10-23 Alex Christensen <[email protected]>
+
Progress towards CMake on Mac
https://bugs.webkit.org/show_bug.cgi?id=150517
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (191527 => 191528)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-10-24 01:01:11 UTC (rev 191527)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-10-24 01:11:36 UTC (rev 191528)
@@ -3214,13 +3214,15 @@
// Execute the supplied block after the next transaction from the WebProcess.
- (void)_doAfterNextPresentationUpdate:(void (^)(void))updateBlock
{
- typeof(updateBlock) updateBlockCopy = nil;
+ void (^updateBlockCopy)(void) = nil;
if (updateBlock)
updateBlockCopy = Block_copy(updateBlock);
_page->callAfterNextPresentationUpdate([updateBlockCopy](WebKit::CallbackBase::Error error) {
- updateBlockCopy();
- Block_release(updateBlockCopy);
+ if (updateBlockCopy) {
+ updateBlockCopy();
+ Block_release(updateBlockCopy);
+ }
});
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes