Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(693)

Unified Diff: sky/engine/core/rendering/RenderObject.cpp

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/rendering/RenderObject.cpp
diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
index a5e1bf9904539bbfeeace935066fbe6a95f6b335..83f588de6e2717d2b9f75395f69bcddde9944312 100644
--- a/sky/engine/core/rendering/RenderObject.cpp
+++ b/sky/engine/core/rendering/RenderObject.cpp
@@ -660,7 +660,7 @@ bool RenderObject::canRenderBorderImage() const
ASSERT(style()->hasBorder());
StyleImage* borderImage = style()->borderImage().image();
- return borderImage && borderImage->canRender(*this, style()->effectiveZoom()) && borderImage->isLoaded();
+ return borderImage && borderImage->canRender(*this) && borderImage->isLoaded();
}
bool RenderObject::mustInvalidateFillLayersPaintOnWidthChange(const FillLayer& layer) const
@@ -671,7 +671,7 @@ bool RenderObject::mustInvalidateFillLayersPaintOnWidthChange(const FillLayer& l
// Make sure we have a valid image.
StyleImage* img = layer.image();
- if (!img || !img->canRender(*this, style()->effectiveZoom()))
+ if (!img || !img->canRender(*this))
return false;
if (layer.repeatX() != RepeatFill && layer.repeatX() != NoRepeatFill)
@@ -708,7 +708,7 @@ bool RenderObject::mustInvalidateFillLayersPaintOnHeightChange(const FillLayer&
// Make sure we have a valid image.
StyleImage* img = layer.image();
- if (!img || !img->canRender(*this, style()->effectiveZoom()))
+ if (!img || !img->canRender(*this))
return false;
if (layer.repeatY() != RepeatFill && layer.repeatY() != NoRepeatFill)
@@ -2487,26 +2487,15 @@ Element* RenderObject::offsetParent() const
if (isDocumentElement())
return 0;
- // If A is an area HTML element which has a map HTML element somewhere in the ancestor
- // chain return the nearest ancestor map HTML element and stop this algorithm.
- // FIXME: Implement!
-
- float effectiveZoom = style()->effectiveZoom();
Node* node = 0;
for (RenderObject* ancestor = parent(); ancestor; ancestor = ancestor->parent()) {
// Spec: http://www.w3.org/TR/cssom-view/#offset-attributes
-
node = ancestor->node();
-
if (!node)
continue;
if (ancestor->isPositioned())
break;
-
- // Webkit specific extension where offsetParent stops at zoom level changes.
- if (effectiveZoom != ancestor->style()->effectiveZoom())
- break;
}
return node && node->isElementNode() ? toElement(node) : 0;
« no previous file with comments | « sky/engine/core/rendering/RenderImageResourceStyleImage.cpp ('k') | sky/engine/core/rendering/RenderReplaced.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698