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

aroben at apple.com aroben at apple.com
Wed Dec 22 13:44:24 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4d29e7791886204f6b9f9fb74455355e03416ede
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 17:24:14 2010 +0000

    Add WebPageCreationParameters
    
    This struct is used in any messages that end up creating a WebPage.
    Using a struct instead of individual parameters will make it easier to
    add platform-specific data, such as an HWND on Windows.
    
    Fixes <http://webkit.org/b/46470> Pass parameters for creating a
    WebPage in a single struct
    
    Reviewed by Anders Carlsson.
    
    * Shared/WebPageCreationParameters.cpp: Added.
    (WebKit::WebPageCreationParameters::encode):
    (WebKit::WebPageCreationParameters::decode):
    Simple encode/decode functions.
    
    * Shared/WebPageCreationParameters.h: Added.
    
    * UIProcess/WebPageProxy.cpp:
    (WebKit::WebPageProxy::initializeWebPage):
    (WebKit::WebPageProxy::reinitializeWebPage):
    (WebKit::WebPageProxy::didReceiveSyncMessage):
    * WebProcess/WebCoreSupport/WebChromeClient.cpp:
    (WebKit::WebChromeClient::createWindow):
    * WebProcess/WebProcess.cpp:
    (WebKit::WebProcess::createWebPage):
    (WebKit::WebProcess::didReceiveMessage):
    * WebProcess/WebProcess.h:
    Changed to use WebPageCreationParameters instead of passing the
    values individually.
    
    * WebKit2.pro:
    * WebKit2.xcodeproj/project.pbxproj:
    * win/WebKit2.vcproj:
    Added WebPageCreationParameters.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68272 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5252abc..395b02c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,43 @@
 2010-09-24  Adam Roben  <aroben at apple.com>
 
+        Add WebPageCreationParameters
+
+        This struct is used in any messages that end up creating a WebPage.
+        Using a struct instead of individual parameters will make it easier to
+        add platform-specific data, such as an HWND on Windows.
+
+        Fixes <http://webkit.org/b/46470> Pass parameters for creating a
+        WebPage in a single struct
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/WebPageCreationParameters.cpp: Added.
+        (WebKit::WebPageCreationParameters::encode):
+        (WebKit::WebPageCreationParameters::decode):
+        Simple encode/decode functions.
+
+        * Shared/WebPageCreationParameters.h: Added.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::initializeWebPage):
+        (WebKit::WebPageProxy::reinitializeWebPage):
+        (WebKit::WebPageProxy::didReceiveSyncMessage):
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::createWindow):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::createWebPage):
+        (WebKit::WebProcess::didReceiveMessage):
+        * WebProcess/WebProcess.h:
+        Changed to use WebPageCreationParameters instead of passing the
+        values individually.
+
+        * WebKit2.pro:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * win/WebKit2.vcproj:
+        Added WebPageCreationParameters.
+
+2010-09-24  Adam Roben  <aroben at apple.com>
+
         Stop pretending that we know how to encode a DrawingArea and just
         encode the DrawingAreaInfo directly
 
diff --git a/WebKit2/Shared/WebPageCreationParameters.cpp b/WebKit2/Shared/WebPageCreationParameters.cpp
new file mode 100644
index 0000000..b8b09c3
--- /dev/null
+++ b/WebKit2/Shared/WebPageCreationParameters.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C)  2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebPageCreationParameters.h"
+
+#include "ArgumentEncoder.h"
+
+namespace WebKit {
+
+void WebPageCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) const
+{
+    encoder->encode(viewSize);
+    encoder->encode(store);
+    encoder->encode(drawingAreaInfo);
+}
+
+bool WebPageCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, WebPageCreationParameters& parameters)
+{
+    if (!decoder->decode(parameters.viewSize))
+        return false;
+    if (!decoder->decode(parameters.store))
+        return false;
+    if (!decoder->decode(parameters.drawingAreaInfo))
+        return false;
+    return true;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/WebPageCreationParameters.h b/WebKit2/Shared/WebPageCreationParameters.h
new file mode 100644
index 0000000..9cb9e5d
--- /dev/null
+++ b/WebKit2/Shared/WebPageCreationParameters.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C)  2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebPageCreationParameters_h
+#define WebPageCreationParameters_h
+
+#include "DrawingAreaBase.h"
+#include "WebPreferencesStore.h"
+#include <WebCore/IntSize.h>
+
+namespace CoreIPC {
+    class ArgumentDecoder;
+    class ArgumentEncoder;
+}
+
+namespace WebKit {
+
+struct WebPageCreationParameters {
+    void encode(CoreIPC::ArgumentEncoder*) const;
+    static bool decode(CoreIPC::ArgumentDecoder*, WebPageCreationParameters&);
+
+    WebCore::IntSize viewSize;
+    WebPreferencesStore store;
+    DrawingAreaBase::DrawingAreaInfo drawingAreaInfo;
+};
+
+} // namespace WebKit
+
+#endif // WebPageCreationParameters_h
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 2b44228..4757d82 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -39,6 +39,7 @@
 #include "WebEvent.h"
 #include "WebFormSubmissionListenerProxy.h"
 #include "WebFramePolicyListenerProxy.h"
+#include "WebPageCreationParameters.h"
 #include "WebPageMessages.h"
 #include "WebPageNamespace.h"
 #include "WebPageProxyMessageKinds.h"
@@ -153,7 +154,12 @@ void WebPageProxy::initializeWebPage(const IntSize& size)
     }
 
     ASSERT(m_drawingArea);
-    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), m_drawingArea->info()));
+
+    WebPageCreationParameters parameters;
+    parameters.viewSize = size;
+    parameters.store = pageNamespace()->context()->preferences()->store();
+    parameters.drawingAreaInfo = m_drawingArea->info();
+    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(parameters));
 }
 
 void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
@@ -162,7 +168,12 @@ void WebPageProxy::reinitializeWebPage(const WebCore::IntSize& size)
         return;
 
     ASSERT(m_drawingArea);
-    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(size, pageNamespace()->context()->preferences()->store(), m_drawingArea->info()));
+
+    WebPageCreationParameters parameters;
+    parameters.viewSize = size;
+    parameters.store = pageNamespace()->context()->preferences()->store();
+    parameters.drawingAreaInfo = m_drawingArea->info();
+    process()->send(WebProcessMessage::Create, m_pageID, CoreIPC::In(parameters));
 }
 
 void WebPageProxy::close()
@@ -879,13 +890,15 @@ void WebPageProxy::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIP
     switch (messageID.get<WebPageProxyMessage::Kind>()) {
         case WebPageProxyMessage::CreateNewPage: {
             RefPtr<WebPageProxy> newPage = createNewPage();
+            WebPageCreationParameters parameters;
             if (newPage) {
                 // FIXME: Pass the real size.
-                reply->encode(CoreIPC::In(newPage->pageID(), IntSize(100, 100), 
-                                          newPage->pageNamespace()->context()->preferences()->store(),
-                                          newPage->drawingArea()->info()));
+                parameters.viewSize = IntSize(100, 100);
+                parameters.store = newPage->pageNamespace()->context()->preferences()->store();
+                parameters.drawingAreaInfo = newPage->drawingArea()->info();
+                reply->encode(CoreIPC::In(newPage->pageID(), parameters));
             } else {
-                reply->encode(CoreIPC::In(static_cast<uint64_t>(0), IntSize(), WebPreferencesStore(), DrawingAreaBase::DrawingAreaInfo()));
+                reply->encode(CoreIPC::In(static_cast<uint64_t>(0), parameters));
             }
             break;
         }
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 9cfaf7c..944b722 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -180,6 +180,7 @@ HEADERS += \
     Shared/WebEvent.h \
     Shared/WebNumber.h \
     Shared/WebNavigationDataStore.h \
+    Shared/WebPageCreationParameters.h \
     Shared/WebPreferencesStore.h \
     Shared/WebURLRequest.h \
     Shared/WebURLResponse.h \
@@ -299,6 +300,7 @@ SOURCES += \
     Shared/MutableDictionary.cpp \
     Shared/VisitedLinkTable.cpp \
     Shared/WebEventConversion.cpp \
+    Shared/WebPageCreationParameters.cpp \
     Shared/WebPreferencesStore.cpp \
     Shared/WebURLRequest.cpp \
     Shared/WebURLResponse.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 5b995c4..d8a62d3 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -377,6 +377,7 @@
 		BCF69FA31176D01400471A52 /* WebNavigationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA11176D01400471A52 /* WebNavigationData.cpp */; };
 		BCF69FA91176D1CB00471A52 /* WKNavigationData.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF69FA71176D1CB00471A52 /* WKNavigationData.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BCF69FAA1176D1CB00471A52 /* WKNavigationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */; };
+		C06C6095124C144B0001682F /* WebPageCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C06C6093124C14430001682F /* WebPageCreationParameters.cpp */; };
 		C0CE72A01247E71D00BC0EC4 /* WebPageMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0CE729E1247E71D00BC0EC4 /* WebPageMessageReceiver.cpp */; };
 		C0CE72A11247E71D00BC0EC4 /* WebPageMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = C0CE729F1247E71D00BC0EC4 /* WebPageMessages.h */; };
 		C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = C0CE72AC1247E78D00BC0EC4 /* HandleMessage.h */; };
@@ -797,6 +798,8 @@
 		BCF69FA11176D01400471A52 /* WebNavigationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNavigationData.cpp; sourceTree = "<group>"; };
 		BCF69FA71176D1CB00471A52 /* WKNavigationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationData.h; sourceTree = "<group>"; };
 		BCF69FA81176D1CB00471A52 /* WKNavigationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKNavigationData.cpp; sourceTree = "<group>"; };
+		C06C6093124C14430001682F /* WebPageCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageCreationParameters.cpp; sourceTree = "<group>"; };
+		C06C6094124C14430001682F /* WebPageCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageCreationParameters.h; sourceTree = "<group>"; };
 		C08FDE87124A851C007645BD /* messages_unittest.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = messages_unittest.py; sourceTree = "<group>"; };
 		C0CE72581247E4DA00BC0EC4 /* WebPage.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebPage.messages.in; sourceTree = "<group>"; };
 		C0CE729E1247E71D00BC0EC4 /* WebPageMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageMessageReceiver.cpp; sourceTree = "<group>"; };
@@ -1050,6 +1053,8 @@
 				BC032DB110F4380F0058C15A /* WebEventConversion.h */,
 				BCF69F981176CED600471A52 /* WebNavigationDataStore.h */,
 				BC33DD671238464600360F3F /* WebNumber.h */,
+				C06C6093124C14430001682F /* WebPageCreationParameters.cpp */,
+				C06C6094124C14430001682F /* WebPageCreationParameters.h */,
 				BCD598AB112B7FDF00EC8C23 /* WebPreferencesStore.cpp */,
 				BCD598AA112B7FDF00EC8C23 /* WebPreferencesStore.h */,
 				A72D5D7F1236CBA800A88B15 /* WebSerializedScriptValue.h */,
@@ -2071,6 +2076,7 @@
 				1A0EC910124C0AF5007EF4A5 /* PluginProcessConnectionManager.cpp in Sources */,
 				1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */,
 				1A043A0A124D11A900FFBFB5 /* WebProcessConnection.cpp in Sources */,
+				C06C6095124C144B0001682F /* WebPageCreationParameters.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index 1d275fc..afb0962 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -34,6 +34,7 @@
 #include "WebFrame.h"
 #include "WebFrameLoaderClient.h"
 #include "WebPage.h"
+#include "WebPageCreationParameters.h"
 #include "WebPageProxyMessageKinds.h"
 #include "WebPopupMenu.h"
 #include "WebPreferencesStore.h"
@@ -108,12 +109,10 @@ void WebChromeClient::focusedNodeChanged(Node*)
 Page* WebChromeClient::createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&)
 {
     uint64_t newPageID = 0;
-    IntSize viewSize;
-    WebPreferencesStore store;
-    DrawingAreaBase::DrawingAreaInfo drawingAreaInfo;
+    WebPageCreationParameters parameters;
     if (!WebProcess::shared().connection()->sendSync(WebPageProxyMessage::CreateNewPage,
                                                      m_page->pageID(), CoreIPC::In(),
-                                                     CoreIPC::Out(newPageID, viewSize, store, drawingAreaInfo),
+                                                     CoreIPC::Out(newPageID, parameters),
                                                      CoreIPC::Connection::NoTimeout)) {
         return 0;
     }
@@ -121,7 +120,7 @@ Page* WebChromeClient::createWindow(Frame*, const FrameLoadRequest&, const Windo
     if (!newPageID)
         return 0;
 
-    WebPage* newWebPage = WebProcess::shared().createWebPage(newPageID, viewSize, store, drawingAreaInfo);
+    WebPage* newWebPage = WebProcess::shared().createWebPage(newPageID, parameters);
     return newWebPage->corePage();
 }
 
diff --git a/WebKit2/WebProcess/WebProcess.cpp b/WebKit2/WebProcess/WebProcess.cpp
index 9636705..7349183 100644
--- a/WebKit2/WebProcess/WebProcess.cpp
+++ b/WebKit2/WebProcess/WebProcess.cpp
@@ -31,6 +31,7 @@
 #include "WebCoreArgumentCoders.h"
 #include "WebFrame.h"
 #include "WebPage.h"
+#include "WebPageCreationParameters.h"
 #include "WebPlatformStrategies.h"
 #include "WebPreferencesStore.h"
 #include "WebProcessProxyMessageKinds.h"
@@ -185,14 +186,14 @@ WebPage* WebProcess::webPage(uint64_t pageID) const
     return m_pageMap.get(pageID).get();
 }
 
-WebPage* WebProcess::createWebPage(uint64_t pageID, const IntSize& viewSize, const WebPreferencesStore& store, const DrawingAreaBase::DrawingAreaInfo& drawingAreaInfo)
+WebPage* WebProcess::createWebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
 {
     // It is necessary to check for page existence here since during a window.open() (or targeted
     // link) the WebPage gets created both in the synchronous handler and through the normal way. 
     std::pair<HashMap<uint64_t, RefPtr<WebPage> >::iterator, bool> result = m_pageMap.add(pageID, 0);
     if (result.second) {
         ASSERT(!result.first->second);
-        result.first->second = WebPage::create(pageID, viewSize, store, drawingAreaInfo);
+        result.first->second = WebPage::create(pageID, parameters.viewSize, parameters.store, parameters.drawingAreaInfo);
     }
 
     ASSERT(result.first->second);
@@ -291,13 +292,11 @@ void WebProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::Mes
             
             case WebProcessMessage::Create: {
                 uint64_t pageID = arguments->destinationID();
-                IntSize viewSize;
-                WebPreferencesStore store;
-                DrawingArea::DrawingAreaInfo drawingAreaInfo;
-                if (!arguments->decode(CoreIPC::Out(viewSize, store, drawingAreaInfo)))
+                WebPageCreationParameters parameters;
+                if (!arguments->decode(CoreIPC::Out(parameters)))
                     return;
 
-                createWebPage(pageID, viewSize, store, drawingAreaInfo);
+                createWebPage(pageID, parameters);
                 return;
             }
             case WebProcessMessage::RegisterURLSchemeAsEmptyDocument: {
diff --git a/WebKit2/WebProcess/WebProcess.h b/WebKit2/WebProcess/WebProcess.h
index b15835b..5cf286c 100644
--- a/WebKit2/WebProcess/WebProcess.h
+++ b/WebKit2/WebProcess/WebProcess.h
@@ -44,6 +44,7 @@ namespace WebKit {
 class InjectedBundle;
 class WebFrame;
 class WebPage;
+struct WebPageCreationParameters;
 struct WebPreferencesStore;
 
 class WebProcess : CoreIPC::Connection::Client {
@@ -56,7 +57,7 @@ public:
     RunLoop* runLoop() const { return m_runLoop; }
 
     WebPage* webPage(uint64_t pageID) const;
-    WebPage* createWebPage(uint64_t pageID, const WebCore::IntSize& viewSize, const WebPreferencesStore&, const DrawingAreaBase::DrawingAreaInfo&);
+    WebPage* createWebPage(uint64_t pageID, const WebPageCreationParameters&);
     void removeWebPage(uint64_t pageID);
 
     InjectedBundle* injectedBundle() const { return m_injectedBundle.get(); }
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index 4476a08..e470112 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -481,6 +481,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Shared\WebPageCreationParameters.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Shared\WebPageCreationParameters.h"
+				>
+			</File>
+			<File
 				RelativePath="..\Shared\WebPreferencesStore.cpp"
 				>
 			</File>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list