[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[andersca at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 7286dac37e6bdc0ba88709d493bffa0bc9fa73d7
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 23 18:52:52 2009 +0000

    <rdar://problem/7243354>
    REGRESSION(48580-48636): Crash clicking embedded QT preview button on apple.com/trailers
    
    Reviewed by Adam Roben.
    
    Check for a null IWebPolicyDelegatePrivate.
    
    * WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebFrameLoaderClient::shouldLoadMediaElementURL):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 8d3a743..7b40f6a 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-23  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Adam Roben.
+
+        <rdar://problem/7243354> 
+        REGRESSION(48580-48636): Crash clicking embedded QT preview button on apple.com/trailers
+        
+        Check for a null IWebPolicyDelegatePrivate.
+        
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::shouldLoadMediaElementURL):
+
 2009-09-22  Sam Weinig  <sam at webkit.org>
 
         Rubber-stamped by Adam Roben.
diff --git a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
index 7c1f939..1281420 100644
--- a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -807,7 +807,7 @@ bool WebFrameLoaderClient::shouldLoadMediaElementURL(const KURL& url) const
         return true;
 
     COMPtr<IWebPolicyDelegatePrivate> policyDelegatePrivate(Query, policyDelegate);
-    if (!policyDelegate)
+    if (!policyDelegatePrivate)
         return true;
 
     BOOL retval;

-- 
WebKit Debian packaging