[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 15:43:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5e620a8f6156b67773f583f7388b02fe2511d176
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 11 00:22:22 2010 +0000
2010-11-10 Simon Fraser <simon.fraser at apple.com>
Reviewed by Adam Roben.
Push m_viewSize down to DrawingAreaProxy base class
https://bugs.webkit.org/show_bug.cgi?id=49347
Some refactoring so that the various drawing area classes
can share m_size.
* UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
(WebKit::ChunkedUpdateDrawingAreaProxy::setSize):
* UIProcess/ChunkedUpdateDrawingAreaProxy.h:
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::setSize):
(WebKit::DrawingAreaProxy::size):
* UIProcess/LayerBackedDrawingAreaProxy.cpp:
(WebKit::LayerBackedDrawingAreaProxy::setSize):
* UIProcess/LayerBackedDrawingAreaProxy.h:
* UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:
(WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
(WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore):
* UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm:
(WebKit::LayerBackedDrawingAreaProxy::platformSetSize):
(WebKit::LayerBackedDrawingAreaProxy::attachCompositingContext):
* UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp:
(WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
* UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp:
(WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71780 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b731806..ebacff7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,33 @@
+2010-11-10 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Adam Roben.
+
+ Push m_viewSize down to DrawingAreaProxy base class
+ https://bugs.webkit.org/show_bug.cgi?id=49347
+
+ Some refactoring so that the various drawing area classes
+ can share m_size.
+
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.cpp:
+ (WebKit::ChunkedUpdateDrawingAreaProxy::setSize):
+ * UIProcess/ChunkedUpdateDrawingAreaProxy.h:
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::setSize):
+ (WebKit::DrawingAreaProxy::size):
+ * UIProcess/LayerBackedDrawingAreaProxy.cpp:
+ (WebKit::LayerBackedDrawingAreaProxy::setSize):
+ * UIProcess/LayerBackedDrawingAreaProxy.h:
+ * UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm:
+ (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
+ (WebKit::ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore):
+ * UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm:
+ (WebKit::LayerBackedDrawingAreaProxy::platformSetSize):
+ (WebKit::LayerBackedDrawingAreaProxy::attachCompositingContext):
+ * UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp:
+ (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
+ * UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp:
+ (WebKit::ChunkedUpdateDrawingAreaProxy::ensureBackingStore):
+
2010-11-10 Anders Carlsson <andersca at apple.com>
Reviewed by Dan Bernstein.
diff --git a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
index d56c9cb..b370f07 100644
--- a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.cpp
@@ -75,6 +75,8 @@ void ChunkedUpdateDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingCo
void ChunkedUpdateDrawingAreaProxy::setSize(const IntSize& viewSize)
{
+ DrawingAreaProxy::setSize(viewSize);
+
WebPageProxy* page = this->page();
if (!page->isValid())
return;
@@ -82,7 +84,6 @@ void ChunkedUpdateDrawingAreaProxy::setSize(const IntSize& viewSize)
if (viewSize.isEmpty())
return;
- m_viewSize = viewSize;
m_lastSetViewSize = viewSize;
if (m_isWaitingForDidSetFrameNotification)
diff --git a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
index 9963f02..47b5357 100644
--- a/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
+++ b/WebKit2/UIProcess/ChunkedUpdateDrawingAreaProxy.h
@@ -88,7 +88,6 @@ private:
bool m_isVisible;
bool m_forceRepaintWhenResumingPainting;
- WebCore::IntSize m_viewSize; // Size of the BackingStore as well.
WebCore::IntSize m_lastSetViewSize;
#if PLATFORM(MAC)
diff --git a/WebKit2/UIProcess/DrawingAreaProxy.h b/WebKit2/UIProcess/DrawingAreaProxy.h
index f281161..73e2140 100644
--- a/WebKit2/UIProcess/DrawingAreaProxy.h
+++ b/WebKit2/UIProcess/DrawingAreaProxy.h
@@ -27,6 +27,7 @@
#define DrawingAreaProxy_h
#include "DrawingAreaBase.h"
+#include <WebCore/IntSize.h>
#if PLATFORM(QT)
class QPainter;
@@ -52,7 +53,8 @@ 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&) = 0;
+ virtual void setSize(const WebCore::IntSize& size) { m_size = size; }
+ const WebCore::IntSize& size() const { return m_size; }
virtual void setPageIsVisible(bool isVisible) = 0;
@@ -63,6 +65,7 @@ public:
protected:
DrawingAreaProxy(Type);
+ WebCore::IntSize m_size;
};
} // namespace WebKit
diff --git a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
index 4c57cd9..f90ed46 100644
--- a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
+++ b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.cpp
@@ -61,6 +61,8 @@ void LayerBackedDrawingAreaProxy::paint(const IntRect& rect, PlatformDrawingCont
void LayerBackedDrawingAreaProxy::setSize(const IntSize& viewSize)
{
+ DrawingAreaProxy::setSize(viewSize);
+
WebPageProxy* page = this->page();
if (!page->isValid())
return;
@@ -68,7 +70,6 @@ void LayerBackedDrawingAreaProxy::setSize(const IntSize& viewSize)
if (viewSize.isEmpty())
return;
- m_viewSize = viewSize;
m_lastSetViewSize = viewSize;
platformSetSize();
diff --git a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
index 70651da..a37b6b3 100644
--- a/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
+++ b/WebKit2/UIProcess/LayerBackedDrawingAreaProxy.h
@@ -82,7 +82,6 @@ private:
bool m_isWaitingForDidSetFrameNotification;
bool m_isVisible;
- WebCore::IntSize m_viewSize; // Size of the BackingStore as well.
WebCore::IntSize m_lastSetViewSize;
#if PLATFORM(MAC)
diff --git a/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm b/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm
index 90ba900..fea55e9 100644
--- a/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm
+++ b/WebKit2/UIProcess/mac/ChunkedUpdateDrawingAreaProxyMac.mm
@@ -47,10 +47,11 @@ void ChunkedUpdateDrawingAreaProxy::ensureBackingStore()
return;
RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
- m_bitmapContext.adoptCF(CGBitmapContextCreate(0, m_viewSize.width(), m_viewSize.height(), 8, m_viewSize.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
+ const IntSize& viewSize = size();
+ m_bitmapContext.adoptCF(CGBitmapContextCreate(0, viewSize.width(), viewSize.height(), 8, viewSize.width() * 4, colorSpace.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
// Flip the bitmap context coordinate system.
- CGContextTranslateCTM(m_bitmapContext.get(), 0, m_viewSize.height());
+ CGContextTranslateCTM(m_bitmapContext.get(), 0, viewSize.height());
CGContextScaleCTM(m_bitmapContext.get(), 1, -1);
}
@@ -75,7 +76,7 @@ void ChunkedUpdateDrawingAreaProxy::drawUpdateChunkIntoBackingStore(UpdateChunk*
RetainPtr<CGImageRef> image(updateChunk->createImage());
const IntRect& updateChunkRect = updateChunk->rect();
- CGContextDrawImage(m_bitmapContext.get(), CGRectMake(updateChunkRect.x(), m_viewSize.height() - updateChunkRect.bottom(),
+ CGContextDrawImage(m_bitmapContext.get(), CGRectMake(updateChunkRect.x(), size().height() - updateChunkRect.bottom(),
updateChunkRect.width(), updateChunkRect.height()), image.get());
[m_webView setNeedsDisplayInRect:NSRectFromCGRect(updateChunkRect)];
}
diff --git a/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm b/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm
index 00d3f6c..846eb25 100644
--- a/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm
+++ b/WebKit2/UIProcess/mac/LayerBackedDrawingAreaProxyMac.mm
@@ -45,7 +45,7 @@ WebPageProxy* LayerBackedDrawingAreaProxy::page()
void LayerBackedDrawingAreaProxy::platformSetSize()
{
- [m_compositingRootLayer.get() setBounds:CGRectMake(0, 0, m_viewSize.width(), m_viewSize.height())];
+ [m_compositingRootLayer.get() setBounds:CGRectMake(0, 0, size().width(), size().height())];
}
void LayerBackedDrawingAreaProxy::attachCompositingContext(uint32_t contextID)
@@ -69,7 +69,7 @@ void LayerBackedDrawingAreaProxy::attachCompositingContext(uint32_t contextID)
[m_compositingRootLayer.get() setStyle:[NSDictionary dictionaryWithObject:actions forKey:@"actions"]];
[m_compositingRootLayer.get() setAnchorPoint:CGPointZero];
- [m_compositingRootLayer.get() setBounds:CGRectMake(0, 0, m_viewSize.width(), m_viewSize.height())];
+ [m_compositingRootLayer.get() setBounds:CGRectMake(0, 0, size().width(), size().height())];
// FIXME: this fixes the layer jiggle when resizing the window, but breaks layer flipping because
// CA doesn't propagate the kCALayerFlagFlippedAbove through the remote layer.
diff --git a/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp b/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp
index 291a161..b9cc976 100644
--- a/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp
+++ b/WebKit2/UIProcess/qt/ChunkedUpdateDrawingAreaProxyQt.cpp
@@ -48,7 +48,7 @@ void ChunkedUpdateDrawingAreaProxy::ensureBackingStore()
if (!m_backingStoreImage.isNull())
return;
- m_backingStoreImage = QImage(m_viewSize.width(), m_viewSize.height(), QImage::Format_RGB32);
+ m_backingStoreImage = QImage(size().width(), size().height(), QImage::Format_RGB32);
}
void ChunkedUpdateDrawingAreaProxy::invalidateBackingStore()
diff --git a/WebKit2/UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp b/WebKit2/UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp
index cff71ba..e366e9c 100644
--- a/WebKit2/UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp
+++ b/WebKit2/UIProcess/win/ChunkedUpdateDrawingAreaProxyWin.cpp
@@ -44,7 +44,7 @@ void ChunkedUpdateDrawingAreaProxy::ensureBackingStore()
if (m_backingStoreBitmap)
return;
- BitmapInfo bitmapInfo = BitmapInfo::createBottomUp(m_viewSize);
+ BitmapInfo bitmapInfo = BitmapInfo::createBottomUp(size());
void* pixels = 0;
m_backingStoreBitmap.set(::CreateDIBSection(0, &bitmapInfo, DIB_RGB_COLORS, &pixels, 0, 0));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list