[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:45:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f43f9a7c7676854d0884f99d0547248a1025ff12
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 22:11:08 2010 +0000
Make WebPage::create take a WebPageCreationParameter struct
It only makes sense, after all.
Fixes <http://webkit.org/b/46502>.
Reviewed by Anders Carlsson.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::create):
(WebKit::WebPage::WebPage):
* WebProcess/WebPage/WebPage.h:
Changed to take a WebPageCreationParameters struct.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::createWebPage): Changed to pass a
WebPageCreationParameters struct.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68296 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6fb36e6..ca4ef3e 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-24 Adam Roben <aroben at apple.com>
+
+ Make WebPage::create take a WebPageCreationParameter struct
+
+ It only makes sense, after all.
+
+ Fixes <http://webkit.org/b/46502>.
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::create):
+ (WebKit::WebPage::WebPage):
+ * WebProcess/WebPage/WebPage.h:
+ Changed to take a WebPageCreationParameters struct.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::createWebPage): Changed to pass a
+ WebPageCreationParameters struct.
+
2010-09-24 Kenneth Rohde Christiansen <kenneth.christiansen at openbossa.org>
Reviewed by Andreas Kling.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index a239ed6..9ae2f63 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -42,6 +42,7 @@
#include "WebEventConversion.h"
#include "WebFrame.h"
#include "WebInspectorClient.h"
+#include "WebPageCreationParameters.h"
#include "WebPageProxyMessageKinds.h"
#include "WebProcessProxyMessageKinds.h"
#include "WebPreferencesStore.h"
@@ -81,9 +82,9 @@ namespace WebKit {
static WTF::RefCountedLeakCounter webPageCounter("WebPage");
#endif
-PassRefPtr<WebPage> WebPage::create(uint64_t pageID, const IntSize& viewSize, const WebPreferencesStore& store, const DrawingAreaBase::DrawingAreaInfo& drawingAreaInfo)
+PassRefPtr<WebPage> WebPage::create(uint64_t pageID, const WebPageCreationParameters& parameters)
{
- RefPtr<WebPage> page = adoptRef(new WebPage(pageID, viewSize, store, drawingAreaInfo));
+ RefPtr<WebPage> page = adoptRef(new WebPage(pageID, parameters));
if (WebProcess::shared().injectedBundle())
WebProcess::shared().injectedBundle()->didCreatePage(page.get());
@@ -91,9 +92,9 @@ PassRefPtr<WebPage> WebPage::create(uint64_t pageID, const IntSize& viewSize, co
return page.release();
}
-WebPage::WebPage(uint64_t pageID, const IntSize& viewSize, const WebPreferencesStore& store, const DrawingAreaBase::DrawingAreaInfo& drawingAreaInfo)
- : m_viewSize(viewSize)
- , m_drawingArea(DrawingArea::create(drawingAreaInfo.type, drawingAreaInfo.id, this))
+WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
+ : m_viewSize(parameters.viewSize)
+ , m_drawingArea(DrawingArea::create(parameters.drawingAreaInfo.type, parameters.drawingAreaInfo.id, this))
, m_isInRedo(false)
#if PLATFORM(MAC)
, m_windowIsVisible(false)
@@ -111,23 +112,23 @@ WebPage::WebPage(uint64_t pageID, const IntSize& viewSize, const WebPreferencesS
pageClients.backForwardControllerClient = new WebBackForwardControllerClient(this);
m_page = adoptPtr(new Page(pageClients));
- m_page->settings()->setJavaScriptEnabled(store.javaScriptEnabled);
- m_page->settings()->setLoadsImagesAutomatically(store.loadsImagesAutomatically);
- m_page->settings()->setPluginsEnabled(store.pluginsEnabled);
- m_page->settings()->setOfflineWebApplicationCacheEnabled(store.offlineWebApplicationCacheEnabled);
- m_page->settings()->setLocalStorageEnabled(store.localStorageEnabled);
- m_page->settings()->setXSSAuditorEnabled(store.xssAuditorEnabled);
- m_page->settings()->setFrameFlatteningEnabled(store.frameFlatteningEnabled);
- m_page->settings()->setMinimumFontSize(store.minimumFontSize);
- m_page->settings()->setMinimumLogicalFontSize(store.minimumLogicalFontSize);
- m_page->settings()->setDefaultFontSize(store.defaultFontSize);
- m_page->settings()->setDefaultFixedFontSize(store.defaultFixedFontSize);
- m_page->settings()->setStandardFontFamily(store.standardFontFamily);
- m_page->settings()->setCursiveFontFamily(store.cursiveFontFamily);
- m_page->settings()->setFantasyFontFamily(store.fantasyFontFamily);
- m_page->settings()->setFixedFontFamily(store.fixedFontFamily);
- m_page->settings()->setSansSerifFontFamily(store.sansSerifFontFamily);
- m_page->settings()->setSerifFontFamily(store.serifFontFamily);
+ m_page->settings()->setJavaScriptEnabled(parameters.store.javaScriptEnabled);
+ m_page->settings()->setLoadsImagesAutomatically(parameters.store.loadsImagesAutomatically);
+ m_page->settings()->setPluginsEnabled(parameters.store.pluginsEnabled);
+ m_page->settings()->setOfflineWebApplicationCacheEnabled(parameters.store.offlineWebApplicationCacheEnabled);
+ m_page->settings()->setLocalStorageEnabled(parameters.store.localStorageEnabled);
+ m_page->settings()->setXSSAuditorEnabled(parameters.store.xssAuditorEnabled);
+ m_page->settings()->setFrameFlatteningEnabled(parameters.store.frameFlatteningEnabled);
+ m_page->settings()->setMinimumFontSize(parameters.store.minimumFontSize);
+ m_page->settings()->setMinimumLogicalFontSize(parameters.store.minimumLogicalFontSize);
+ m_page->settings()->setDefaultFontSize(parameters.store.defaultFontSize);
+ m_page->settings()->setDefaultFixedFontSize(parameters.store.defaultFixedFontSize);
+ m_page->settings()->setStandardFontFamily(parameters.store.standardFontFamily);
+ m_page->settings()->setCursiveFontFamily(parameters.store.cursiveFontFamily);
+ m_page->settings()->setFantasyFontFamily(parameters.store.fantasyFontFamily);
+ m_page->settings()->setFixedFontFamily(parameters.store.fixedFontFamily);
+ m_page->settings()->setSansSerifFontFamily(parameters.store.sansSerifFontFamily);
+ m_page->settings()->setSerifFontFamily(parameters.store.serifFontFamily);
m_page->settings()->setJavaScriptCanOpenWindowsAutomatically(true);
m_page->setGroupName("WebKit2Group");
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index b8f09b8..3a25f4e 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -72,13 +72,14 @@ class WebWheelEvent;
#if ENABLE(TOUCH_EVENTS)
class WebTouchEvent;
#endif
+struct WebPageCreationParameters;
struct WebPreferencesStore;
class WebPage : public APIObject {
public:
static const Type APIType = TypeBundlePage;
- static PassRefPtr<WebPage> create(uint64_t pageID, const WebCore::IntSize& viewSize, const WebPreferencesStore&, const DrawingAreaBase::DrawingAreaInfo&);
+ static PassRefPtr<WebPage> create(uint64_t pageID, const WebPageCreationParameters&);
~WebPage();
void close();
@@ -156,7 +157,7 @@ public:
static const WebEvent* currentEvent();
private:
- WebPage(uint64_t pageID, const WebCore::IntSize& viewSize, const WebPreferencesStore&, const DrawingAreaBase::DrawingAreaInfo&);
+ WebPage(uint64_t pageID, const WebPageCreationParameters&);
virtual Type type() const { return APIType; }
diff --git a/WebKit2/WebProcess/WebProcess.cpp b/WebKit2/WebProcess/WebProcess.cpp
index 7349183..157dd17 100644
--- a/WebKit2/WebProcess/WebProcess.cpp
+++ b/WebKit2/WebProcess/WebProcess.cpp
@@ -193,7 +193,7 @@ WebPage* WebProcess::createWebPage(uint64_t pageID, const WebPageCreationParamet
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, parameters.viewSize, parameters.store, parameters.drawingAreaInfo);
+ result.first->second = WebPage::create(pageID, parameters);
}
ASSERT(result.first->second);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list