Diff
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-11-15 22:21:46 UTC (rev 100321)
@@ -1,5 +1,34 @@
2011-11-15 Lucas Forschler <lforsch...@apple.com>
+ Merge 90925
+
+ 2011-07-12 Simon Fraser <simon.fra...@apple.com>
+
+ Rename compositing-related updateContentsScale() methods
+ https://bugs.webkit.org/show_bug.cgi?id=64430
+
+ Reviewed by Joseph Pecoraro.
+
+ Rename updateContentsScale() to something less presumptuous; layers may choose
+ to do something other than update their contents scale when the page scale factor
+ changes. pageScaleFactorChanged() is a better name.
+
+ * page/Frame.cpp:
+ (WebCore::Frame::pageScaleFactorChanged):
+ (WebCore::Frame::scalePage):
+ * page/Frame.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::pageScaleFactorChanged):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::pageScaleFactorChanged):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::pageScaleFactorChanged):
+ * rendering/RenderLayerCompositor.h:
+
+2011-11-15 Lucas Forschler <lforsch...@apple.com>
+
Merge 100022
2011-11-11 Beth Dakin <bda...@apple.com>
Modified: branches/safari-534.53-branch/Source/WebCore/page/Frame.cpp (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/page/Frame.cpp 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/page/Frame.cpp 2011-11-15 22:21:46 UTC (rev 100321)
@@ -1043,14 +1043,14 @@
}
#if USE(ACCELERATED_COMPOSITING)
-void Frame::updateContentsScale(float scale)
+void Frame::pageScaleFactorChanged(float scale)
{
for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
- child->updateContentsScale(scale);
+ child->pageScaleFactorChanged(scale);
RenderView* root = contentRenderer();
if (root && root->compositor())
- root->compositor()->updateContentsScale(scale);
+ root->compositor()->pageScaleFactorChanged(scale);
}
#endif
@@ -1069,7 +1069,7 @@
document->recalcStyle(Node::Force);
#if USE(ACCELERATED_COMPOSITING)
- updateContentsScale(scale);
+ pageScaleFactorChanged(scale);
#endif
}
Modified: branches/safari-534.53-branch/Source/WebCore/page/Frame.h (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/page/Frame.h 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/page/Frame.h 2011-11-15 22:21:46 UTC (rev 100321)
@@ -217,7 +217,7 @@
void lifeSupportTimerFired(Timer<Frame>*);
#if USE(ACCELERATED_COMPOSITING)
- void updateContentsScale(float);
+ void pageScaleFactorChanged(float);
#endif
HashSet<FrameDestructionObserver*> m_destructionObservers;
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.cpp (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.cpp 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.cpp 2011-11-15 22:21:46 UTC (rev 100321)
@@ -4180,11 +4180,11 @@
m_reflection->setStyle(newStyle.release());
}
-void RenderLayer::updateContentsScale(float scale)
+void RenderLayer::pageScaleFactorChanged(float scale)
{
#if USE(ACCELERATED_COMPOSITING)
if (m_backing)
- m_backing->updateContentsScale(scale);
+ m_backing->pageScaleFactorChanged(scale);
#endif
}
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.h (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.h 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.h 2011-11-15 22:21:46 UTC (rev 100321)
@@ -606,7 +606,7 @@
void setMustOverlapCompositedLayers(bool b) { m_mustOverlapCompositedLayers = b; }
#endif
- void updateContentsScale(float);
+ void pageScaleFactorChanged(float);
friend class RenderLayerBacking;
friend class RenderLayerCompositor;
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-11-15 22:21:46 UTC (rev 100321)
@@ -1478,7 +1478,7 @@
return ContainerCompositingLayer;
}
-void RenderLayerBacking::updateContentsScale(float scale)
+void RenderLayerBacking::pageScaleFactorChanged(float scale)
{
float combinedScale = scale * backingScaleFactor();
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerBacking.h (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerBacking.h 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerBacking.h 2011-11-15 22:21:46 UTC (rev 100321)
@@ -136,7 +136,7 @@
// For informative purposes only.
CompositingLayerType compositingLayerType() const;
- void updateContentsScale(float);
+ void pageScaleFactorChanged(float);
GraphicsLayer* layerForHorizontalScrollbar() const { return m_layerForHorizontalScrollbar.get(); }
GraphicsLayer* layerForVerticalScrollbar() const { return m_layerForVerticalScrollbar.get(); }
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2011-11-15 22:21:46 UTC (rev 100321)
@@ -1804,31 +1804,31 @@
return false;
}
-void RenderLayerCompositor::updateContentsScale(float scale, RenderLayer* layer)
+void RenderLayerCompositor::pageScaleFactorChanged(float scale, RenderLayer* layer)
{
if (!layer)
layer = rootRenderLayer();
- layer->updateContentsScale(scale);
+ layer->pageScaleFactorChanged(scale);
if (layer->isStackingContext()) {
if (Vector<RenderLayer*>* negZOrderList = layer->negZOrderList()) {
size_t listSize = negZOrderList->size();
for (size_t i = 0; i < listSize; ++i)
- updateContentsScale(scale, negZOrderList->at(i));
+ pageScaleFactorChanged(scale, negZOrderList->at(i));
}
if (Vector<RenderLayer*>* posZOrderList = layer->posZOrderList()) {
size_t listSize = posZOrderList->size();
for (size_t i = 0; i < listSize; ++i)
- updateContentsScale(scale, posZOrderList->at(i));
+ pageScaleFactorChanged(scale, posZOrderList->at(i));
}
}
if (Vector<RenderLayer*>* normalFlowList = layer->normalFlowList()) {
size_t listSize = normalFlowList->size();
for (size_t i = 0; i < listSize; ++i)
- updateContentsScale(scale, normalFlowList->at(i));
+ pageScaleFactorChanged(scale, normalFlowList->at(i));
}
}
Modified: branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerCompositor.h (100320 => 100321)
--- branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2011-11-15 22:19:59 UTC (rev 100320)
+++ branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2011-11-15 22:21:46 UTC (rev 100321)
@@ -189,7 +189,7 @@
bool compositorShowDebugBorders() const { return m_showDebugBorders; }
bool compositorShowRepaintCounter() const { return m_showRepaintCounter; }
- void updateContentsScale(float, RenderLayer* = 0);
+ void pageScaleFactorChanged(float, RenderLayer* = 0);
GraphicsLayer* layerForHorizontalScrollbar() const { return m_layerForHorizontalScrollbar.get(); }
GraphicsLayer* layerForVerticalScrollbar() const { return m_layerForVerticalScrollbar.get(); }
