[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

darin at apple.com darin at apple.com
Wed Dec 22 18:07:08 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b0d815f9aaef58d00b545d422cb040c697f35488
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 16:30:34 2010 +0000

    Try to fix build.
    
    * Api/qwebpage.cpp:
    (frameLoadRequest): Added missing parentheses.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index fdb2de0..40c5681 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2244,7 +2244,7 @@ bool QWebPage::supportsContentType(const QString& mimeType) const
 
 static WebCore::FrameLoadRequest frameLoadRequest(const QUrl &url, WebCore::Frame *frame)
 {
-    return WebCore::FrameLoadRequest(frame->document()->securityOrigin,
+    return WebCore::FrameLoadRequest(frame->document()->securityOrigin(),
         WebCore::ResourceRequest(url, frame->loader()->outgoingReferrer()));
 }
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 99642ef..6d341ba 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-07  Darin Adler  <darin at apple.com>
+
+        Try to fix build.
+
+        * Api/qwebpage.cpp:
+        (frameLoadRequest): Added missing parentheses.
+
 2010-12-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Sam Weinig.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list