Changeset 76135 in webkit

Timestamp:

Jan 19, 2011 10:18:00 AM (13 years ago)

Author:

andersca@apple.com

Message:

2011-01-19 Anders Carlsson <​andersca@apple.com>

Reviewed by Darin Adler.

Pass WebPageCreationParameters to DrawingArea::create
​https://bugs.webkit.org/show_bug.cgi?id=52726

• WebProcess/WebPage/DrawingArea.cpp: (WebKit::DrawingArea::create):
• WebProcess/WebPage/DrawingArea.h:
• WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::create): (WebKit::DrawingAreaImpl::DrawingAreaImpl):
• WebProcess/WebPage/DrawingAreaImpl.h:
• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::WebPage): (WebKit::WebPage::changeAcceleratedCompositingMode):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/DrawingArea.cpp (modified) (2 diffs)
• WebProcess/WebPage/DrawingArea.h (modified) (1 diff)
• WebProcess/WebPage/DrawingAreaImpl.cpp (modified) (3 diffs)
• WebProcess/WebPage/DrawingAreaImpl.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-01-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Pass WebPageCreationParameters to DrawingArea::create
+        https://bugs.webkit.org/show_bug.cgi?id=52726
+
+        * WebProcess/WebPage/DrawingArea.cpp:
+        (WebKit::DrawingArea::create):
+        * WebProcess/WebPage/DrawingArea.h:
+        * WebProcess/WebPage/DrawingAreaImpl.cpp:
+        (WebKit::DrawingAreaImpl::create):
+        (WebKit::DrawingAreaImpl::DrawingAreaImpl):
+        * WebProcess/WebPage/DrawingAreaImpl.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        (WebKit::WebPage::changeAcceleratedCompositingMode):
+
 2011-01-19  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp

@@ -41 +41 @@
 #endif
 
+#include "WebPageCreationParameters.h"
+
 namespace WebKit {
 
-PassRefPtr<DrawingArea> DrawingArea::create(DrawingAreaInfo::Type type, DrawingAreaInfo::Identifier identifier, WebPage* webPage)
+PassRefPtr<DrawingArea> DrawingArea::create(WebPage* webPage, const WebPageCreationParameters& parameters)
 {
-    switch (type) {
+    switch (parameters.drawingAreaInfo.type) {
         case DrawingAreaInfo::None:
             ASSERT_NOT_REACHED();
@@ -52 +54 @@
         case DrawingAreaInfo::Impl:
 #ifdef __APPLE__
-            return DrawingAreaImpl::create(identifier, webPage);
+            return DrawingAreaImpl::create(webPage, parameters);
 #else
             return 0;
 #endif
         case DrawingAreaInfo::ChunkedUpdate:
-            return adoptRef(new ChunkedUpdateDrawingArea(identifier, webPage));
+            return adoptRef(new ChunkedUpdateDrawingArea(parameters.drawingAreaInfo.identifier, webPage));
 
 #if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
         case DrawingAreaInfo::LayerBacked:
-            return adoptRef(new LayerBackedDrawingArea(identifier, webPage));
+            return adoptRef(new LayerBackedDrawingArea(parameters.drawingAreaInfo.identifier, webPage));
 #endif
 #if ENABLE(TILED_BACKING_STORE)
         case DrawingAreaInfo::Tiled:
-            return adoptRef(new TiledDrawingArea(identifier, webPage));
+            return adoptRef(new TiledDrawingArea(parameters.drawingAreaInfo.identifier, webPage));
 #endif
     }

trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

@@ -41 +41 @@
 
 class WebPage;
+class WebPageCreationParameters;
 
 class DrawingArea : public RefCounted<DrawingArea> {
 public:
     // FIXME: It might make sense to move this create function into a factory style class. 
-    static PassRefPtr<DrawingArea> create(DrawingAreaInfo::Type, DrawingAreaInfo::Identifier, WebPage*);
+    static PassRefPtr<DrawingArea> create(WebPage*, const WebPageCreationParameters&);
     virtual ~DrawingArea();
     

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp

@@ -30 +30 @@
 #include "UpdateInfo.h"
 #include "WebPage.h"
+#include "WebPageCreationParameters.h"
 #include "WebProcess.h"
 #include <WebCore/GraphicsContext.h>
@@ -41 +42 @@
 namespace WebKit {
 
-PassRefPtr<DrawingAreaImpl> DrawingAreaImpl::create(DrawingAreaInfo::Identifier identifier, WebPage* webPage)
-{
-    return adoptRef(new DrawingAreaImpl(identifier, webPage));
+PassRefPtr<DrawingAreaImpl> DrawingAreaImpl::create(WebPage* webPage, const WebPageCreationParameters& parameters)
+{
+    return adoptRef(new DrawingAreaImpl(webPage, parameters));
 }
 
@@ -50 +51 @@
 }
 
-DrawingAreaImpl::DrawingAreaImpl(DrawingAreaInfo::Identifier identifier, WebPage* webPage)
-    : DrawingArea(DrawingAreaInfo::Impl, identifier, webPage)
+DrawingAreaImpl::DrawingAreaImpl(WebPage* webPage, const WebPageCreationParameters& parameters)
+    : DrawingArea(DrawingAreaInfo::Impl, parameters.drawingAreaInfo.identifier, webPage)
     , m_isWaitingForDidUpdate(false)
     , m_displayTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::display)

trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h

@@ -37 +37 @@
 class DrawingAreaImpl : public DrawingArea {
 public:
-    static PassRefPtr<DrawingAreaImpl> create(DrawingAreaInfo::Identifier, WebPage*);
+    static PassRefPtr<DrawingAreaImpl> create(WebPage*, const WebPageCreationParameters&);
     virtual ~DrawingAreaImpl();
 
 private:
-    DrawingAreaImpl(DrawingAreaInfo::Identifier, WebPage*);
+    DrawingAreaImpl(WebPage*, const WebPageCreationParameters&);
 
     // DrawingArea

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -183 +183 @@
     Settings::setMinDOMTimerInterval(0.004);
 
-    m_drawingArea = DrawingArea::create(parameters.drawingAreaInfo.type, parameters.drawingAreaInfo.identifier, this);
+    m_drawingArea = DrawingArea::create(this, parameters);
     m_mainFrame = WebFrame::createMainFrame(this);
 
@@ -323 +323 @@
         m_drawingArea = 0;
         if (newDrawingAreaInfo.type != DrawingAreaInfo::None) {
-            m_drawingArea = DrawingArea::create(newDrawingAreaInfo.type, newDrawingAreaInfo.identifier, this);
+            WebPageCreationParameters parameters;
+            parameters.drawingAreaInfo = newDrawingAreaInfo;
+            m_drawingArea = DrawingArea::create(this, parameters);
             m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), m_viewSize));
         }