Fix CMake compile error and add correct null check

https://bugs.webkit.org/show_bug.cgi?id=150520

Patch by Alex Christensen <achristensen@webkit.org> on 2015-10-23
Reviewed by Simon Fraser.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _doAfterNextPresentationUpdate:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 3751925..6f0b495 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
 2015-10-23  Alex Christensen  <achristensen@webkit.org>
 
+        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  <achristensen@webkit.org>
+
         Progress towards CMake on Mac
         https://bugs.webkit.org/show_bug.cgi?id=150517
 

diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
index 9440180..ef31efb 100644 (file)
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
@@ -3214,13 +3214,15 @@ static inline WebKit::FindOptions toFindOptions(_WKFindOptions wkFindOptions)
 // 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);
+        }
     });
 }