[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 18:47:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4e1adc4ed82fe5d842b6b6d26b0c4a7eee52eb1f
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 17 22:11:32 2010 +0000
2010-12-17 Brian Weinstein <bweinstein at apple.com>
Qt build fix.
* UIProcess/qt/WebPopupMenuProxyQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74294 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b6c5486..0da2182 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -70,6 +70,30 @@
Reviewed by Sam Weinig.
+ DrawingAreaProxy::setSize shouldn't be a virtual member function
+ https://bugs.webkit.org/show_bug.cgi?id=51275
+
+ Add a pure virtual sizeDidChange member function to DrawingAreaProxy, and only
+ call it if the size changes.
+
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
+ (WebKit::ChunkedUpdateDrawingAreaProxy::sizeDidChange):
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.h:
+ * UIProcess/DrawingAreaProxy.cpp:
+ (WebKit::DrawingAreaProxy::setSize):
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::size):
+ * UIProcess/LayerBackedDrawingAreaProxy.cpp:
+ (WebKit::LayerBackedDrawingAreaProxy::sizeDidChange):
+ * UIProcess/LayerBackedDrawingAreaProxy.h:
+ * UIProcess/TiledDrawingAreaProxy.cpp:
+ (WebKit::TiledDrawingAreaProxy::sizeDidChange):
+ * UIProcess/TiledDrawingAreaProxy.h:
+
+2010-12-17 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
Add a WebPageProxy parameter to the DrawingAreaProxy constructor
https://bugs.webkit.org/show_bug.cgi?id=51271
diff --git a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
index dc0a9ce..24c47c4 100644
--- a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
@@ -73,25 +73,23 @@ void ChunkedUpdateDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingCo
platformPaint(rect, context);
}
-void ChunkedUpdateDrawingAreaProxy::setSize(const IntSize& viewSize)
+void ChunkedUpdateDrawingAreaProxy::sizeDidChange()
{
- DrawingAreaProxy::setSize(viewSize);
-
WebPageProxy* page = this->page();
if (!page->isValid())
return;
- if (viewSize.isEmpty())
+ if (m_size.isEmpty())
return;
- m_lastSetViewSize = viewSize;
+ m_lastSetViewSize = m_size;
if (m_isWaitingForDidSetFrameNotification)
return;
m_isWaitingForDidSetFrameNotification = true;
page->process()->responsivenessTimer()->start();
- page->process()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(info().identifier, viewSize));
+ page->process()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(info().identifier, m_size));
}
void ChunkedUpdateDrawingAreaProxy::setPageIsVisible(bool isVisible)
diff --git a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
index 589d3c1..4ec1689 100644
--- a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
+++ b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
@@ -69,7 +69,7 @@ private:
// DrawingAreaProxy
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
virtual void paint(const WebCore::IntRect&, PlatformDrawingContext);
- virtual void setSize(const WebCore::IntSize&);
+ virtual void sizeDidChange();
virtual void setPageIsVisible(bool isVisible);
void ensureBackingStore();
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.cpp b/WebKit2/UIProcess/DrawingAreaProxy.cpp
index 15ae3fd..c026968 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/DrawingAreaProxy.cpp
@@ -25,6 +25,8 @@
#include "DrawingAreaProxy.h"
+using namespace WebCore;
+
namespace WebKit {
DrawingAreaProxy::DrawingAreaProxy(DrawingAreaInfo::Type type, WebPageProxy* webPageProxy)
@@ -43,4 +45,13 @@ DrawingAreaInfo::Identifier DrawingAreaProxy::nextIdentifier()
return ++nextID;
}
+void DrawingAreaProxy::setSize(const IntSize& size)
+{
+ if (m_size == size)
+ return;
+
+ m_size = size;
+ sizeDidChange();
+}
+
} // namespace WebKit
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.h b/WebKit2/UIProcess/DrawingAreaProxy.h
index 1093b5b..48f0ae2 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -55,9 +55,7 @@ public:
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*) { ASSERT_NOT_REACHED(); }
virtual void paint(const WebCore::IntRect&, PlatformDrawingContext) = 0;
- virtual void setSize(const WebCore::IntSize& size) { m_size = size; }
- const WebCore::IntSize& size() const { return m_size; }
-
+ virtual void sizeDidChange() = 0;
virtual void setPageIsVisible(bool isVisible) = 0;
#if USE(ACCELERATED_COMPOSITING)
@@ -67,6 +65,9 @@ public:
const DrawingAreaInfo& info() const { return m_info; }
+ const WebCore::IntSize& size() const { return m_size; }
+ void setSize(const WebCore::IntSize&);
+
protected:
explicit DrawingAreaProxy(DrawingAreaInfo::Type, WebPageProxy*);
diff --git a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
index 46e1207..0f8f7d3 100644
--- a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
@@ -61,18 +61,16 @@ void LayerBackedDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingCont
}
#endif
-void LayerBackedDrawingAreaProxy::setSize(const IntSize& viewSize)
+void LayerBackedDrawingAreaProxy::sizeDidChange()
{
- DrawingAreaProxy::setSize(viewSize);
-
WebPageProxy* page = this->page();
if (!page->isValid())
return;
- if (viewSize.isEmpty())
+ if (m_size.isEmpty())
return;
- m_lastSetViewSize = viewSize;
+ m_lastSetViewSize = m_size;
platformSetSize();
@@ -82,7 +80,7 @@ void LayerBackedDrawingAreaProxy::setSize(const IntSize& viewSize)
m_isWaitingForDidSetFrameNotification = true;
page->process()->responsivenessTimer()->start();
- page->process()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(info().identifier, viewSize));
+ page->process()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(info().identifier, m_size));
}
#if !PLATFORM(MAC) && !PLATFORM(WIN)
diff --git a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
index e93db87..3ce96a8 100644
--- a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
+++ b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
@@ -68,7 +68,7 @@ private:
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder*);
virtual void paint(const WebCore::IntRect&, PlatformDrawingContext);
- virtual void setSize(const WebCore::IntSize&);
+ virtual void sizeDidChange();
virtual void setPageIsVisible(bool isVisible);
virtual void attachCompositingContext(uint32_t contextID);
diff --git a/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp b/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
index 7c4a4a7..3b29647 100644
--- a/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp
@@ -65,24 +65,24 @@ TiledDrawingAreaProxy::~TiledDrawingAreaProxy()
{
}
-void TiledDrawingAreaProxy::setSize(const IntSize& viewSize)
+void TiledDrawingAreaProxy::sizeDidChange()
{
WebPageProxy* page = this->page();
if (!page || !page->isValid())
return;
- if (viewSize.isEmpty())
+ if (m_size.isEmpty())
return;
- m_viewSize = viewSize;
- m_lastSetViewSize = viewSize;
+ m_viewSize = m_size;
+ m_lastSetViewSize = m_size;
if (m_isWaitingForDidSetFrameNotification)
return;
m_isWaitingForDidSetFrameNotification = true;
page->process()->responsivenessTimer()->start();
- page->process()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(viewSize));
+ page->process()->send(DrawingAreaMessage::SetSize, page->pageID(), CoreIPC::In(m_size));
}
void TiledDrawingAreaProxy::setPageIsVisible(bool isVisible)
diff --git a/WebKit2/UIProcess/TiledDrawingAreaProxy.h b/WebKit2/UIProcess/TiledDrawingAreaProxy.h
index 8ff6312..a4b440c 100644
--- a/WebKit2/UIProcess/TiledDrawingAreaProxy.h
+++ b/WebKit2/UIProcess/TiledDrawingAreaProxy.h
@@ -116,7 +116,7 @@ private:
virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, CoreIPC::ArgumentEncoder&);
virtual void paint(const WebCore::IntRect&, PlatformDrawingContext);
- virtual void setSize(const WebCore::IntSize&);
+ virtual void sizeDidChange();
virtual void setPageIsVisible(bool isVisible);
void didSetSize(const WebCore::IntSize&);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list