[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:19 UTC 2010


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

    WebCore: Try to fix V8 build.
    
    * bindings/generic/BindingDOMWindow.h:
    (WebCore::BindingDOMWindow::createWindow): Pass security origin.
    
    WebKit2: Get a bit closer to making Qt WebKit2 compile again.
    
    * WebKit2.pro: Add the WebDatabaseManager source files.
    Still missing: The Qt version of the databaseDirectory function.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6ec1fcb..3b5ee2c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-07  Darin Adler  <darin at apple.com>
 
+        Try to fix V8 build.
+
+        * bindings/generic/BindingDOMWindow.h:
+        (WebCore::BindingDOMWindow::createWindow): Pass security origin.
+
+2010-12-07  Darin Adler  <darin at apple.com>
+
         Another build fix.
 
         * loader/CrossOriginAccessControl.cpp: Added a missing include.
diff --git a/WebCore/bindings/generic/BindingDOMWindow.h b/WebCore/bindings/generic/BindingDOMWindow.h
index 26c2f4d..34e0177 100644
--- a/WebCore/bindings/generic/BindingDOMWindow.h
+++ b/WebCore/bindings/generic/BindingDOMWindow.h
@@ -93,7 +93,7 @@ Frame* BindingDOMWindow<Binding>::createWindow(State<Binding>* state,
     String referrer = enteredFrame->loader()->outgoingReferrer();
     request.setHTTPReferrer(referrer);
     FrameLoader::addHTTPOriginIfNeeded(request, enteredFrame->loader()->outgoingOrigin());
-    FrameLoadRequest frameRequest(request, frameName);
+    FrameLoadRequest frameRequest(callingFrame->document()->securityOrigin(), request, frameName);
 
     // FIXME: It's much better for client API if a new window starts with a URL,
     // here where we know what URL we are going to open. Unfortunately, this
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b6de3a2..bc1206b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-07  Darin Adler  <darin at apple.com>
+
+        Get a bit closer to making Qt WebKit2 compile again.
+
+        * WebKit2.pro: Add the WebDatabaseManager source files.
+        Still missing: The Qt version of the databaseDirectory function.
+
 2010-12-07  Jessie Berlin  <jberlin at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 0baec05..dd462c4 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -378,6 +378,7 @@ HEADERS += \
     WebProcess/Plugins/PluginView.h \
     WebProcess/WebCoreSupport/WebChromeClient.h \
     WebProcess/WebCoreSupport/WebContextMenuClient.h \
+    WebProcess/WebCoreSupport/WebDatabaseManager.h \
     WebProcess/WebCoreSupport/WebDragClient.h \
     WebProcess/WebCoreSupport/WebEditorClient.h \
     WebProcess/WebCoreSupport/WebErrors.h \
@@ -579,6 +580,7 @@ SOURCES += \
     WebProcess/Plugins/PluginView.cpp \
     WebProcess/WebCoreSupport/WebChromeClient.cpp \
     WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
+    WebProcess/WebCoreSupport/WebDatabaseManager.cpp \
     WebProcess/WebCoreSupport/WebDragClient.cpp \
     WebProcess/WebCoreSupport/WebEditorClient.cpp \
     WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list