diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/blackberry/WebKitSupport/BackingStoreTile.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/blackberry/WebKitSupport/BackingStoreTile.cpp')
| -rw-r--r-- | Source/WebKit/blackberry/WebKitSupport/BackingStoreTile.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/WebKit/blackberry/WebKitSupport/BackingStoreTile.cpp b/Source/WebKit/blackberry/WebKitSupport/BackingStoreTile.cpp index 262fbeff2..5cccadb33 100644 --- a/Source/WebKit/blackberry/WebKitSupport/BackingStoreTile.cpp +++ b/Source/WebKit/blackberry/WebKitSupport/BackingStoreTile.cpp @@ -37,6 +37,7 @@ TileBuffer::TileBuffer(const Platform::IntSize& size) : m_size(size) , m_fence(Fence::create()) , m_buffer(0) + , m_scale(1.0) { } @@ -55,14 +56,14 @@ Platform::IntRect TileBuffer::rect() const return Platform::IntRect(Platform::IntPoint::zero(), m_size); } -bool TileBuffer::isRendered() const +bool TileBuffer::isRendered(double scale) const { - return isRendered(rect()); + return isRendered(rect(), scale); } -bool TileBuffer::isRendered(const Platform::IntRectRegion& contents) const +bool TileBuffer::isRendered(const Platform::IntRectRegion& contents, double scale) const { - return Platform::IntRectRegion::subtractRegions(contents, m_renderedRegion).isEmpty(); + return m_scale == scale && Platform::IntRectRegion::subtractRegions(contents, m_renderedRegion).isEmpty(); } void TileBuffer::clearRenderedRegion(const Platform::IntRectRegion& region) @@ -98,6 +99,11 @@ Platform::Graphics::Buffer* TileBuffer::nativeBuffer() const return m_buffer; } +bool TileBuffer::wasNativeBufferCreated() const +{ + return static_cast<bool>(m_buffer); +} + BackingStoreTile::BackingStoreTile(const Platform::IntSize& size, BufferingMode mode) : m_bufferingMode(mode) |