- Revision
- 108491
- Author
- [email protected]
- Date
- 2012-02-22 05:56:24 -0800 (Wed, 22 Feb 2012)
Log Message
Merge setVisibleRectTrajectoryVector and adjustVisibleRect to the more descriptive coverWithTilesIfNeeded https://bugs.webkit.org/show_bug.cgi?id=79230
Reviewed by Simon Hausmann.
Source/WebCore:
Both setVisibleRectTrajectoryVector and the adjustVisibleRect are
used for initiating re-tiling, so make that more obvious and merge
the two.
* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::coverWithTilesIfNeeded):
* platform/graphics/TiledBackingStore.h:
(TiledBackingStore):
Source/WebKit/qt:
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::paint):
Use coverWithTilesIfNeeded().
Source/WebKit2:
Replace use by coverWithTilesIfNeeded().
* WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
(WebCore::WebGraphicsLayer::setVisibleContentRectTrajectoryVector):
(WebCore::WebGraphicsLayer::adjustVisibleRect):
(WebCore::WebGraphicsLayer::computeTransformedVisibleRect):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108490 => 108491)
--- trunk/Source/WebCore/ChangeLog 2012-02-22 13:38:15 UTC (rev 108490)
+++ trunk/Source/WebCore/ChangeLog 2012-02-22 13:56:24 UTC (rev 108491)
@@ -1,3 +1,20 @@
+2012-02-22 Kenneth Rohde Christiansen <[email protected]>
+
+ Merge setVisibleRectTrajectoryVector and adjustVisibleRect to
+ the more descriptive coverWithTilesIfNeeded
+ https://bugs.webkit.org/show_bug.cgi?id=79230
+
+ Reviewed by Simon Hausmann.
+
+ Both setVisibleRectTrajectoryVector and the adjustVisibleRect are
+ used for initiating re-tiling, so make that more obvious and merge
+ the two.
+
+ * platform/graphics/TiledBackingStore.cpp:
+ (WebCore::TiledBackingStore::coverWithTilesIfNeeded):
+ * platform/graphics/TiledBackingStore.h:
+ (TiledBackingStore):
+
2012-02-17 Nikolas Zimmermann <[email protected]>
REGRESSION: unbalanced transparency layers for clipPath
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (108490 => 108491)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2012-02-22 13:38:15 UTC (rev 108490)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2012-02-22 13:56:24 UTC (rev 108491)
@@ -68,12 +68,15 @@
m_tileCreationDelay = delay;
}
-void TiledBackingStore::setVisibleRectTrajectoryVector(const FloatPoint& vector)
+void TiledBackingStore::coverWithTilesIfNeeded(const FloatPoint& panningTrajectoryVector)
{
- if (m_visibleRectTrajectoryVector == vector)
+ IntRect visibleRect = visibleContentsRect();
+ if (m_visibleRectTrajectoryVector == panningTrajectoryVector && m_previousVisibleRect == visibleRect)
return;
- m_visibleRectTrajectoryVector = vector;
+ m_visibleRectTrajectoryVector = panningTrajectoryVector;
+ m_previousVisibleRect = visibleRect;
+
startTileCreationTimer();
}
@@ -161,16 +164,6 @@
context->restore();
}
-void TiledBackingStore::adjustVisibleRect()
-{
- IntRect visibleRect = visibleContentsRect();
- if (m_previousVisibleRect == visibleRect)
- return;
- m_previousVisibleRect = visibleRect;
-
- startTileCreationTimer();
-}
-
IntRect TiledBackingStore::visibleContentsRect()
{
return mapFromContents(intersection(m_client->tiledBackingStoreVisibleRect(), m_client->tiledBackingStoreContentsRect()));
Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.h (108490 => 108491)
--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2012-02-22 13:38:15 UTC (rev 108490)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2012-02-22 13:56:24 UTC (rev 108491)
@@ -44,12 +44,13 @@
TiledBackingStore(TiledBackingStoreClient*, PassOwnPtr<TiledBackingStoreBackend> = TiledBackingStoreBackend::create());
~TiledBackingStore();
- void adjustVisibleRect();
-
TiledBackingStoreClient* client() { return m_client; }
+
+ void coverWithTilesIfNeeded(const FloatPoint& panningTrajectoryVector = FloatPoint());
+
float contentsScale() { return m_contentsScale; }
void setContentsScale(float);
-
+
bool contentsFrozen() const { return m_contentsFrozen; }
void setContentsFrozen(bool);
void updateTileBuffers();
@@ -59,11 +60,9 @@
IntSize tileSize() { return m_tileSize; }
void setTileSize(const IntSize&);
-
+
double tileCreationDelay() const { return m_tileCreationDelay; }
void setTileCreationDelay(double delay);
-
- void setVisibleRectTrajectoryVector(const FloatPoint&);
IntRect mapToContents(const IntRect&) const;
IntRect mapFromContents(const IntRect&) const;
Modified: trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp (108490 => 108491)
--- trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp 2012-02-22 13:38:15 UTC (rev 108490)
+++ trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp 2012-02-22 13:56:24 UTC (rev 108491)
@@ -288,13 +288,13 @@
#if USE(TILED_BACKING_STORE)
if (WebCore::TiledBackingStore* backingStore = QWebFramePrivate::core(page()->mainFrame())->tiledBackingStore()) {
// FIXME: We should set the backing store viewport earlier than in paint
- backingStore->adjustVisibleRect();
+ backingStore->coverWithTilesIfNeeded();
// QWebFrame::render is a public API, bypass it for tiled rendering so behavior does not need to change.
- WebCore::GraphicsContext context(painter);
+ WebCore::GraphicsContext context(painter);
page()->mainFrame()->d->renderFromTiledBackingStore(&context, option->exposedRect.toAlignedRect());
painter->setRenderHints(oldHints);
return;
- }
+ }
#endif
#if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
page()->mainFrame()->render(painter, d->overlay() ? QWebFrame::ContentsLayer : QWebFrame::AllLayers, option->exposedRect.toAlignedRect());
Modified: trunk/Source/WebKit/qt/ChangeLog (108490 => 108491)
--- trunk/Source/WebKit/qt/ChangeLog 2012-02-22 13:38:15 UTC (rev 108490)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-02-22 13:56:24 UTC (rev 108491)
@@ -1,3 +1,16 @@
+2012-02-22 Kenneth Rohde Christiansen <[email protected]>
+
+ Merge setVisibleRectTrajectoryVector and adjustVisibleRect to
+ the more descriptive coverWithTilesIfNeeded
+ https://bugs.webkit.org/show_bug.cgi?id=79230
+
+ Reviewed by Simon Hausmann.
+
+ * Api/qgraphicswebview.cpp:
+ (QGraphicsWebView::paint):
+
+ Use coverWithTilesIfNeeded().
+
2012-02-22 Ryosuke Niwa <[email protected]>
Remove the remaining uses of CSSStyleDeclaration in Editor
Modified: trunk/Source/WebKit2/ChangeLog (108490 => 108491)
--- trunk/Source/WebKit2/ChangeLog 2012-02-22 13:38:15 UTC (rev 108490)
+++ trunk/Source/WebKit2/ChangeLog 2012-02-22 13:56:24 UTC (rev 108491)
@@ -1,3 +1,18 @@
+2012-02-22 Kenneth Rohde Christiansen <[email protected]>
+
+ Merge setVisibleRectTrajectoryVector and adjustVisibleRect to
+ the more descriptive coverWithTilesIfNeeded
+ https://bugs.webkit.org/show_bug.cgi?id=79230
+
+ Reviewed by Simon Hausmann.
+
+ Replace use by coverWithTilesIfNeeded().
+
+ * WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+ (WebCore::WebGraphicsLayer::setVisibleContentRectTrajectoryVector):
+ (WebCore::WebGraphicsLayer::adjustVisibleRect):
+ (WebCore::WebGraphicsLayer::computeTransformedVisibleRect):
+
2012-02-22 Zalan Bujtas <[email protected]>
[Qt][WK2] Add frame flattening setting to QWebPreferences.
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (108490 => 108491)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-02-22 13:38:15 UTC (rev 108490)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp 2012-02-22 13:56:24 UTC (rev 108491)
@@ -482,7 +482,7 @@
void WebGraphicsLayer::setVisibleContentRectTrajectoryVector(const FloatPoint& trajectoryVector)
{
if (m_mainBackingStore)
- m_mainBackingStore->setVisibleRectTrajectoryVector(trajectoryVector);
+ m_mainBackingStore->coverWithTilesIfNeeded(trajectoryVector);
}
void WebGraphicsLayer::setContentsScale(float scale)
@@ -628,7 +628,7 @@
void WebGraphicsLayer::adjustVisibleRect()
{
if (m_mainBackingStore)
- m_mainBackingStore->adjustVisibleRect();
+ m_mainBackingStore->coverWithTilesIfNeeded();
}
void WebGraphicsLayer::computeTransformedVisibleRect()
@@ -641,9 +641,9 @@
m_layerTransform.setFlattening(!preserves3D());
m_layerTransform.setChildrenTransform(childrenTransform());
m_layerTransform.combineTransforms(parent() ? toWebGraphicsLayer(parent())->m_layerTransform.combinedForChildren() : TransformationMatrix());
+
// The combined transform will be used in tiledBackingStoreVisibleRect.
- if (m_mainBackingStore)
- m_mainBackingStore->adjustVisibleRect();
+ adjustVisibleRect();
}
#endif
