[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
andersca at apple.com
andersca at apple.com
Fri Jan 21 14:42:28 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit d194c8ad2ba0e5059b6af494bfc072559d47d364
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 26 19:26:36 2010 +0000
Drawing area cleanup. Remove a bunch of redundant functions that just ended
up calling setNeedsDisplay.
Reviewed by Sam Weinig.
* UIProcess/DrawingAreaProxy.h:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::invalidateWindow):
(WebKit::WebChromeClient::invalidateContentsAndWindow):
(WebKit::WebChromeClient::invalidateContentsForSlowScroll):
* WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp:
* WebProcess/WebPage/ChunkedUpdateDrawingArea.h:
* WebProcess/WebPage/DrawingArea.h:
* WebProcess/WebPage/LayerBackedDrawingArea.cpp:
* WebProcess/WebPage/LayerBackedDrawingArea.h:
* WebProcess/WebPage/TiledDrawingArea.cpp:
* WebProcess/WebPage/TiledDrawingArea.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74668 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index bb51b0e..88935a2 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-26 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Drawing area cleanup. Remove a bunch of redundant functions that just ended
+ up calling setNeedsDisplay.
+
+ * UIProcess/DrawingAreaProxy.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::invalidateWindow):
+ (WebKit::WebChromeClient::invalidateContentsAndWindow):
+ (WebKit::WebChromeClient::invalidateContentsForSlowScroll):
+ * WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp:
+ * WebProcess/WebPage/ChunkedUpdateDrawingArea.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/LayerBackedDrawingArea.cpp:
+ * WebProcess/WebPage/LayerBackedDrawingArea.h:
+ * WebProcess/WebPage/TiledDrawingArea.cpp:
+ * WebProcess/WebPage/TiledDrawingArea.h:
+
2010-12-25 Sam Weinig <sam at webkit.org>
Reviewed by Dan Bernstein.
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.h b/WebKit2/UIProcess/DrawingAreaProxy.h
index 48f0ae2..d7de581 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -46,6 +46,8 @@ typedef QPainter* PlatformDrawingContext;
#endif
class DrawingAreaProxy {
+ WTF_MAKE_NONCOPYABLE(DrawingAreaProxy);
+
public:
static DrawingAreaInfo::Identifier nextIdentifier();
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index 2dec462..6ca0f5c 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -322,20 +322,20 @@ IntRect WebChromeClient::windowResizerRect() const
return m_page->windowResizerRect();
}
-void WebChromeClient::invalidateWindow(const IntRect& rect, bool immediate)
+void WebChromeClient::invalidateWindow(const IntRect&, bool)
{
- m_page->drawingArea()->invalidateWindow(rect, immediate);
+ // Do nothing here, there's no concept of invalidating the window in the web process.
}
-void WebChromeClient::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
+void WebChromeClient::invalidateContentsAndWindow(const IntRect& rect, bool)
{
- m_page->drawingArea()->invalidateContentsAndWindow(rect, immediate);
+ m_page->drawingArea()->setNeedsDisplay(rect);
}
-void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
+void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect, bool)
{
m_page->pageDidScroll();
- m_page->drawingArea()->invalidateContentsForSlowScroll(rect, immediate);
+ m_page->drawingArea()->setNeedsDisplay(rect);
}
void WebChromeClient::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
diff --git a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp
index 1f8eac6..309b2e1 100644
--- a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp
+++ b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.cpp
@@ -49,20 +49,6 @@ ChunkedUpdateDrawingArea::~ChunkedUpdateDrawingArea()
{
}
-void ChunkedUpdateDrawingArea::invalidateWindow(const IntRect& rect, bool immediate)
-{
-}
-
-void ChunkedUpdateDrawingArea::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
-{
- setNeedsDisplay(rect);
-}
-
-void ChunkedUpdateDrawingArea::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
-{
- setNeedsDisplay(rect);
-}
-
void ChunkedUpdateDrawingArea::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
{
// FIXME: Do something much smarter.
diff --git a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h
index 5cc9271..2b71fdd 100644
--- a/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/ChunkedUpdateDrawingArea.h
@@ -39,11 +39,8 @@ public:
ChunkedUpdateDrawingArea(DrawingAreaInfo::Identifier identifier, WebPage*);
virtual ~ChunkedUpdateDrawingArea();
- virtual void invalidateWindow(const WebCore::IntRect& rect, bool immediate);
- virtual void invalidateContentsAndWindow(const WebCore::IntRect& rect, bool immediate);
- virtual void invalidateContentsForSlowScroll(const WebCore::IntRect& rect, bool immediate);
- virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
virtual void setNeedsDisplay(const WebCore::IntRect&);
+ virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
virtual void display();
#if USE(ACCELERATED_COMPOSITING)
diff --git a/WebKit2/WebProcess/WebPage/DrawingArea.h b/WebKit2/WebProcess/WebPage/DrawingArea.h
index f6c97d2..ed67dd5 100644
--- a/WebKit2/WebProcess/WebPage/DrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/DrawingArea.h
@@ -45,16 +45,10 @@ 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*);
-
virtual ~DrawingArea();
- virtual void invalidateWindow(const WebCore::IntRect& rect, bool immediate) = 0;
- virtual void invalidateContentsAndWindow(const WebCore::IntRect& rect, bool immediate) = 0;
- virtual void invalidateContentsForSlowScroll(const WebCore::IntRect& rect, bool immediate) = 0;
- virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect) = 0;
-
virtual void setNeedsDisplay(const WebCore::IntRect&) = 0;
- virtual void display() = 0;
+ virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect) = 0;
virtual void pageBackgroundTransparencyChanged() { }
diff --git a/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp b/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp
index 65c5cb7..6bf62af 100644
--- a/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp
+++ b/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.cpp
@@ -61,21 +61,6 @@ LayerBackedDrawingArea::~LayerBackedDrawingArea()
platformClear();
}
-void LayerBackedDrawingArea::invalidateWindow(const IntRect& rect, bool immediate)
-{
-
-}
-
-void LayerBackedDrawingArea::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
-{
- setNeedsDisplay(rect);
-}
-
-void LayerBackedDrawingArea::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
-{
- setNeedsDisplay(rect);
-}
-
void LayerBackedDrawingArea::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
{
// FIXME: Do something much smarter.
diff --git a/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h b/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
index d049a60..af49753 100644
--- a/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/LayerBackedDrawingArea.h
@@ -55,11 +55,8 @@ public:
LayerBackedDrawingArea(DrawingAreaInfo::Identifier identifier, WebPage*);
virtual ~LayerBackedDrawingArea();
- virtual void invalidateWindow(const WebCore::IntRect& rect, bool immediate);
- virtual void invalidateContentsAndWindow(const WebCore::IntRect& rect, bool immediate);
- virtual void invalidateContentsForSlowScroll(const WebCore::IntRect& rect, bool immediate);
- virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
virtual void setNeedsDisplay(const WebCore::IntRect&);
+ virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
virtual void display();
virtual void pageBackgroundTransparencyChanged();
diff --git a/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp b/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp
index 8ecf396..c0e9d0d 100644
--- a/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp
+++ b/WebKit2/WebProcess/WebPage/TiledDrawingArea.cpp
@@ -55,20 +55,6 @@ TiledDrawingArea::~TiledDrawingArea()
{
}
-void TiledDrawingArea::invalidateWindow(const IntRect& rect, bool immediate)
-{
-}
-
-void TiledDrawingArea::invalidateContentsAndWindow(const IntRect& rect, bool immediate)
-{
- setNeedsDisplay(rect);
-}
-
-void TiledDrawingArea::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
-{
- setNeedsDisplay(rect);
-}
-
void TiledDrawingArea::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
{
// FIXME: Do something much smarter.
diff --git a/WebKit2/WebProcess/WebPage/TiledDrawingArea.h b/WebKit2/WebProcess/WebPage/TiledDrawingArea.h
index a7e418c..f48e151 100644
--- a/WebKit2/WebProcess/WebPage/TiledDrawingArea.h
+++ b/WebKit2/WebProcess/WebPage/TiledDrawingArea.h
@@ -43,11 +43,8 @@ public:
TiledDrawingArea(DrawingAreaInfo::Identifier, WebPage*);
virtual ~TiledDrawingArea();
- virtual void invalidateWindow(const WebCore::IntRect& rect, bool immediate);
- virtual void invalidateContentsAndWindow(const WebCore::IntRect& rect, bool immediate);
- virtual void invalidateContentsForSlowScroll(const WebCore::IntRect& rect, bool immediate);
- virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
virtual void setNeedsDisplay(const WebCore::IntRect&);
+ virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& rectToScroll, const WebCore::IntRect& clipRect);
virtual void display();
#if USE(ACCELERATED_COMPOSITING)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list