[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
andersca at apple.com
andersca at apple.com
Wed Dec 22 17:50:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f6d62285356dccedff069e72fb1f686a6b1695fa
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 1 02:11:50 2010 +0000
Change DrawingArea and DrawingAreaProxy to not inherit from DrawingAreaBase
https://bugs.webkit.org/show_bug.cgi?id=50300
Reviewed by Sam Weinig.
* UIProcess/API/mac/WKView.mm:
(-[WKView _switchToDrawingAreaTypeIfNecessary:DrawingAreaBase::]):
(-[WKView _pageDidEnterAcceleratedCompositing]):
(-[WKView _pageDidLeaveAcceleratedCompositing]):
* UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
(WebKit::ChunkedUpdateDrawingAreaProxy::ChunkedUpdateDrawingAreaProxy):
* UIProcess/DrawingAreaProxy.cpp:
(WebKit::DrawingAreaProxy::DrawingAreaProxy):
(WebKit::DrawingAreaProxy::nextDrawingAreaID):
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::info):
* UIProcess/LayerBackedDrawingAreaProxy.cpp:
(WebKit::LayerBackedDrawingAreaProxy::LayerBackedDrawingAreaProxy):
* WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp:
(WebKit::ChunkedUpdateDrawingArea::ChunkedUpdateDrawingArea):
(WebKit::ChunkedUpdateDrawingArea::didReceiveMessage):
* WebProcess/WebPage/ChunkedUpdateDrawingArea.h:
* WebProcess/WebPage/DrawingArea.cpp:
(WebKit::DrawingArea::create):
(WebKit::DrawingArea::DrawingArea):
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::info):
* WebProcess/WebPage/LayerBackedDrawingArea.cpp:
(WebKit::LayerBackedDrawingArea::LayerBackedDrawingArea):
(WebKit::LayerBackedDrawingArea::didReceiveMessage):
* WebProcess/WebPage/LayerBackedDrawingArea.h:
* WebProcess/WebPage/TiledDrawingArea.cpp:
(WebKit::TiledDrawingArea::TiledDrawingArea):
* WebProcess/WebPage/TiledDrawingArea.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::changeAcceleratedCompositingMode):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72996 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0f6b233..4e9e6d8 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,42 @@
+2010-11-30 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Change DrawingArea and DrawingAreaProxy to not inherit from DrawingAreaBase
+ https://bugs.webkit.org/show_bug.cgi?id=50300
+
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _switchToDrawingAreaTypeIfNecessary:DrawingAreaBase::]):
+ (-[WKView _pageDidEnterAcceleratedCompositing]):
+ (-[WKView _pageDidLeaveAcceleratedCompositing]):
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
+ (WebKit::ChunkedUpdateDrawingAreaProxy::ChunkedUpdateDrawingAreaProxy):
+ * UIProcess/DrawingAreaProxy.cpp:
+ (WebKit::DrawingAreaProxy::DrawingAreaProxy):
+ (WebKit::DrawingAreaProxy::nextDrawingAreaID):
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::info):
+ * UIProcess/LayerBackedDrawingAreaProxy.cpp:
+ (WebKit::LayerBackedDrawingAreaProxy::LayerBackedDrawingAreaProxy):
+ * WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp:
+ (WebKit::ChunkedUpdateDrawingArea::ChunkedUpdateDrawingArea):
+ (WebKit::ChunkedUpdateDrawingArea::didReceiveMessage):
+ * WebProcess/WebPage/ChunkedUpdateDrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.cpp:
+ (WebKit::DrawingArea::create):
+ (WebKit::DrawingArea::DrawingArea):
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::info):
+ * WebProcess/WebPage/LayerBackedDrawingArea.cpp:
+ (WebKit::LayerBackedDrawingArea::LayerBackedDrawingArea):
+ (WebKit::LayerBackedDrawingArea::didReceiveMessage):
+ * WebProcess/WebPage/LayerBackedDrawingArea.h:
+ * WebProcess/WebPage/TiledDrawingArea.cpp:
+ (WebKit::TiledDrawingArea::TiledDrawingArea):
+ * WebProcess/WebPage/TiledDrawingArea.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::changeAcceleratedCompositingMode):
+
2010-11-30 Simon Fraser <simon.fraser at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/API/mac/WKView.mm b/WebKit2/UIProcess/API/mac/WKView.mm
index 65d6ed9..f08c865 100644
--- a/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/WebKit2/UIProcess/API/mac/WKView.mm
@@ -966,21 +966,21 @@ static NSScreen *screenForWindow(NSWindow *window)
}
}
-- (void)_switchToDrawingAreaTypeIfNecessary:(DrawingAreaProxy::Type)type
+- (void)_switchToDrawingAreaTypeIfNecessary:(DrawingAreaBase::Type)type
{
- DrawingAreaProxy::Type existingDrawingAreaType = _data->_page->drawingArea() ? _data->_page->drawingArea()->info().type : DrawingAreaProxy::None;
+ DrawingAreaBase::Type existingDrawingAreaType = _data->_page->drawingArea() ? _data->_page->drawingArea()->info().type : DrawingAreaBase::None;
if (existingDrawingAreaType == type)
return;
OwnPtr<DrawingAreaProxy> newDrawingArea;
switch (type) {
- case DrawingAreaProxy::None:
+ case DrawingAreaBase::None:
break;
- case DrawingAreaProxy::ChunkedUpdateDrawingAreaType: {
+ case DrawingAreaBase::ChunkedUpdateDrawingAreaType: {
newDrawingArea = ChunkedUpdateDrawingAreaProxy::create(self);
break;
}
- case DrawingAreaProxy::LayerBackedDrawingAreaType: {
+ case DrawingAreaBase::LayerBackedDrawingAreaType: {
newDrawingArea = LayerBackedDrawingAreaProxy::create(self);
break;
}
@@ -994,13 +994,13 @@ static NSScreen *screenForWindow(NSWindow *window)
- (void)_pageDidEnterAcceleratedCompositing
{
- [self _switchToDrawingAreaTypeIfNecessary:DrawingAreaProxy::LayerBackedDrawingAreaType];
+ [self _switchToDrawingAreaTypeIfNecessary:DrawingAreaBase::LayerBackedDrawingAreaType];
}
- (void)_pageDidLeaveAcceleratedCompositing
{
// FIXME: we may want to avoid flipping back to the non-layer-backed drawing area until the next page load, to avoid thrashing.
- [self _switchToDrawingAreaTypeIfNecessary:DrawingAreaProxy::ChunkedUpdateDrawingAreaType];
+ [self _switchToDrawingAreaTypeIfNecessary:DrawingAreaBase::ChunkedUpdateDrawingAreaType];
}
#endif // USE(ACCELERATED_COMPOSITING)
diff --git a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
index b370f07..c952e6a 100644
--- a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
@@ -43,7 +43,7 @@ PassOwnPtr<ChunkedUpdateDrawingAreaProxy> ChunkedUpdateDrawingAreaProxy::create(
}
ChunkedUpdateDrawingAreaProxy::ChunkedUpdateDrawingAreaProxy(PlatformWebView* webView)
- : DrawingAreaProxy(ChunkedUpdateDrawingAreaType)
+ : DrawingAreaProxy(DrawingAreaBase::ChunkedUpdateDrawingAreaType)
, m_isWaitingForDidSetFrameNotification(false)
, m_isVisible(true)
, m_forceRepaintWhenResumingPainting(false)
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.cpp b/WebKit2/UIProcess/DrawingAreaProxy.cpp
index e461f90..ec4a4fb 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/DrawingAreaProxy.cpp
@@ -27,8 +27,8 @@
namespace WebKit {
-DrawingAreaProxy::DrawingAreaProxy(Type type)
- : DrawingAreaBase(type, nextDrawingAreaID())
+DrawingAreaProxy::DrawingAreaProxy(DrawingAreaBase::Type type)
+ : m_info(type, nextDrawingAreaID())
{
}
@@ -36,9 +36,9 @@ DrawingAreaProxy::~DrawingAreaProxy()
{
}
-DrawingAreaProxy::DrawingAreaID DrawingAreaProxy::nextDrawingAreaID()
+DrawingAreaBase::DrawingAreaID DrawingAreaProxy::nextDrawingAreaID()
{
- static DrawingAreaID nextID = 1;
+ static DrawingAreaBase::DrawingAreaID nextID = 1;
return ++nextID;
}
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.h b/WebKit2/UIProcess/DrawingAreaProxy.h
index 6708dcf..a7b569f 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -43,9 +43,9 @@ typedef HDC PlatformDrawingContext;
typedef QPainter* PlatformDrawingContext;
#endif
-class DrawingAreaProxy : public DrawingAreaBase {
+class DrawingAreaProxy {
public:
- static DrawingAreaID nextDrawingAreaID();
+ static DrawingAreaBase::DrawingAreaID nextDrawingAreaID();
virtual ~DrawingAreaProxy();
@@ -63,8 +63,12 @@ public:
virtual void detachCompositingContext() = 0;
#endif
+ const DrawingAreaBase::DrawingAreaInfo info() const { return m_info; }
+
protected:
- DrawingAreaProxy(Type);
+ explicit DrawingAreaProxy(DrawingAreaBase::Type);
+
+ DrawingAreaBase::DrawingAreaInfo m_info;
WebCore::IntSize m_size;
};
diff --git a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
index 411ef3f..109c5c3 100644
--- a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
@@ -44,7 +44,7 @@ PassOwnPtr<LayerBackedDrawingAreaProxy> LayerBackedDrawingAreaProxy::create(Plat
}
LayerBackedDrawingAreaProxy::LayerBackedDrawingAreaProxy(PlatformWebView* webView)
- : DrawingAreaProxy(LayerBackedDrawingAreaType)
+ : DrawingAreaProxy(DrawingAreaBase::LayerBackedDrawingAreaType)
, m_isWaitingForDidSetFrameNotification(false)
, m_isVisible(true)
, m_webView(webView)
diff --git a/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp b/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
index 73a86b2..5dbf405 100644
--- a/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
@@ -46,7 +46,7 @@ PassOwnPtr<TiledDrawingAreaProxy> TiledDrawingAreaProxy::create(PlatformWebView*
}
TiledDrawingAreaProxy::TiledDrawingAreaProxy(PlatformWebView* webView)
- : DrawingAreaProxy(TiledDrawingAreaType)
+ : DrawingAreaProxy(DrawingAreaBase::TiledDrawingAreaType)
, m_isWaitingForDidSetFrameNotification(false)
, m_isVisible(true)
, m_webView(webView)
diff --git a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp
index d2834bf..c11cb48 100644
--- a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp
+++ b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp
@@ -37,8 +37,8 @@ using namespace WebCore;
namespace WebKit {
-ChunkedUpdateDrawingArea::ChunkedUpdateDrawingArea(DrawingAreaID identifier, WebPage* webPage)
- : DrawingArea(ChunkedUpdateDrawingAreaType, identifier, webPage)
+ChunkedUpdateDrawingArea::ChunkedUpdateDrawingArea(DrawingAreaBase::DrawingAreaID identifier, WebPage* webPage)
+ : DrawingArea(DrawingAreaBase::ChunkedUpdateDrawingAreaType, identifier, webPage)
, m_isWaitingForUpdate(false)
, m_paintingIsSuspended(false)
, m_displayTimer(WebProcess::shared().runLoop(), this, &ChunkedUpdateDrawingArea::display)
@@ -188,7 +188,7 @@ void ChunkedUpdateDrawingArea::didUpdate()
void ChunkedUpdateDrawingArea::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
- DrawingAreaID targetDrawingAreaID;
+ DrawingAreaBase::DrawingAreaID targetDrawingAreaID;
if (!arguments->decode(CoreIPC::Out(targetDrawingAreaID)))
return;
diff --git a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h
index 767198f..ad39d28 100644
--- a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h
@@ -36,7 +36,7 @@ class UpdateChunk;
class ChunkedUpdateDrawingArea : public DrawingArea {
public:
- ChunkedUpdateDrawingArea(DrawingAreaID identifier, WebPage*);
+ ChunkedUpdateDrawingArea(DrawingAreaBase::DrawingAreaID identifier, WebPage*);
virtual ~ChunkedUpdateDrawingArea();
virtual void invalidateWindow(const WebCore::IntRect& rect, bool immediate);
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.cpp b/WebKit2/WebProcess/WebPage/DrawingArea.cpp
index 0f9b6ae..a56cedf 100644
--- a/WebKit2/WebProcess/WebPage/DrawingArea.cpp
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.cpp
@@ -37,22 +37,22 @@
namespace WebKit {
-PassRefPtr<DrawingArea> DrawingArea::create(Type type, DrawingAreaID identifier, WebPage* webPage)
+PassRefPtr<DrawingArea> DrawingArea::create(DrawingAreaBase::Type type, DrawingAreaBase::DrawingAreaID identifier, WebPage* webPage)
{
switch (type) {
- case None:
+ case DrawingAreaBase::None:
ASSERT_NOT_REACHED();
break;
- case ChunkedUpdateDrawingAreaType:
+ case DrawingAreaBase::ChunkedUpdateDrawingAreaType:
return adoptRef(new ChunkedUpdateDrawingArea(identifier, webPage));
#if USE(ACCELERATED_COMPOSITING) && PLATFORM(MAC)
- case LayerBackedDrawingAreaType:
+ case DrawingAreaBase::LayerBackedDrawingAreaType:
return adoptRef(new LayerBackedDrawingArea(identifier, webPage));
#endif
#if ENABLE(TILED_BACKING_STORE)
- case TiledDrawingAreaType:
+ case DrawingAreaBase::TiledDrawingAreaType:
return adoptRef(new TiledDrawingArea(identifier, webPage));
#endif
}
@@ -60,8 +60,8 @@ PassRefPtr<DrawingArea> DrawingArea::create(Type type, DrawingAreaID identifier,
return 0;
}
-DrawingArea::DrawingArea(Type type, DrawingAreaID identifier, WebPage* webPage)
- : DrawingAreaBase(type, identifier)
+DrawingArea::DrawingArea(DrawingAreaBase::Type type, DrawingAreaBase::DrawingAreaID identifier, WebPage* webPage)
+ : m_info(type, identifier)
, m_webPage(webPage)
{
}
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.h b/WebKit2/WebProcess/WebPage/DrawingArea.h
index 1149d01..f989b8d 100644
--- a/WebKit2/WebProcess/WebPage/DrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.h
@@ -41,10 +41,10 @@ namespace WebKit {
class WebPage;
-class DrawingArea : public DrawingAreaBase, public RefCounted<DrawingArea> {
+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(Type, DrawingAreaID, WebPage*);
+ static PassRefPtr<DrawingArea> create(DrawingAreaBase::Type, DrawingAreaBase::DrawingAreaID, WebPage*);
virtual ~DrawingArea();
@@ -66,9 +66,12 @@ public:
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*) = 0;
+ const DrawingAreaBase::DrawingAreaInfo& info() const { return m_info; }
+
protected:
- DrawingArea(Type, DrawingAreaID, WebPage*);
+ DrawingArea(DrawingAreaBase::Type, DrawingAreaBase::DrawingAreaID, WebPage*);
+ DrawingAreaBase::DrawingAreaInfo m_info;
WebPage* m_webPage;
};
diff --git a/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp b/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp
index 96d7c93..7fb48a7 100644
--- a/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp
+++ b/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp
@@ -39,8 +39,8 @@ using namespace WebCore;
namespace WebKit {
-LayerBackedDrawingArea::LayerBackedDrawingArea(DrawingAreaID identifier, WebPage* webPage)
- : DrawingArea(LayerBackedDrawingAreaType, identifier, webPage)
+LayerBackedDrawingArea::LayerBackedDrawingArea(DrawingAreaBase::DrawingAreaID identifier, WebPage* webPage)
+ : DrawingArea(DrawingAreaBase::LayerBackedDrawingAreaType, identifier, webPage)
, m_syncTimer(WebProcess::shared().runLoop(), this, &LayerBackedDrawingArea::syncCompositingLayers)
, m_attached(false)
, m_shouldPaint(true)
@@ -143,7 +143,7 @@ void LayerBackedDrawingArea::didUpdate()
void LayerBackedDrawingArea::didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments)
{
- DrawingAreaID targetDrawingAreaID;
+ DrawingAreaBase::DrawingAreaID targetDrawingAreaID;
if (!arguments->decode(CoreIPC::Out(targetDrawingAreaID)))
return;
diff --git a/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h b/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
index 4705e71..8a4ee02 100644
--- a/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
@@ -52,7 +52,7 @@ namespace WebKit {
class LayerBackedDrawingArea : public DrawingArea, private WebCore::GraphicsLayerClient {
public:
- LayerBackedDrawingArea(DrawingAreaID identifier, WebPage*);
+ LayerBackedDrawingArea(DrawingAreaBase::DrawingAreaID identifier, WebPage*);
virtual ~LayerBackedDrawingArea();
virtual void invalidateWindow(const WebCore::IntRect& rect, bool immediate);
diff --git a/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp b/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp
index 19a7198..73f26be 100644
--- a/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp
+++ b/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp
@@ -42,8 +42,8 @@ using namespace WebCore;
namespace WebKit {
-TiledDrawingArea::TiledDrawingArea(DrawingAreaID identifier, WebPage* webPage)
- : DrawingArea(TiledDrawingAreaType, identifier, webPage)
+TiledDrawingArea::TiledDrawingArea(DrawingAreaBase::DrawingAreaID identifier, WebPage* webPage)
+ : DrawingArea(DrawingAreaBase::TiledDrawingAreaType, identifier, webPage)
, m_isWaitingForUpdate(false)
, m_shouldPaint(true)
, m_displayTimer(WebProcess::shared().runLoop(), this, &TiledDrawingArea::display)
diff --git a/WebKit2/WebProcess/WebPage/TiledDrawingArea.h b/WebKit2/WebProcess/WebPage/TiledDrawingArea.h
index ce20b65..58db843 100644
--- a/WebKit2/WebProcess/WebPage/TiledDrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/TiledDrawingArea.h
@@ -40,7 +40,7 @@ class UpdateChunk;
class TiledDrawingArea : public DrawingArea {
public:
- TiledDrawingArea(DrawingAreaID identifier, WebPage*);
+ TiledDrawingArea(DrawingAreaBase::DrawingAreaID identifier, WebPage*);
virtual ~TiledDrawingArea();
virtual void invalidateWindow(const WebCore::IntRect& rect, bool immediate);
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 07d1d42..3d6a15b 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -272,14 +272,14 @@ void WebPage::changeAcceleratedCompositingMode(WebCore::GraphicsLayer* layer)
// Tell the UI process that accelerated compositing changed. It may respond by changing
// drawing area types.
- DrawingArea::DrawingAreaInfo newDrawingAreaInfo;
+ DrawingAreaBase::DrawingAreaInfo newDrawingAreaInfo;
if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::DidChangeAcceleratedCompositing(compositing), Messages::WebPageProxy::DidChangeAcceleratedCompositing::Reply(newDrawingAreaInfo), m_pageID))
return;
if (newDrawingAreaInfo.type != drawingArea()->info().type) {
m_drawingArea = 0;
- if (newDrawingAreaInfo.type != DrawingArea::None) {
+ if (newDrawingAreaInfo.type != DrawingAreaBase::None) {
m_drawingArea = DrawingArea::create(newDrawingAreaInfo.type, newDrawingAreaInfo.id, this);
m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), m_viewSize));
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list