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

Unified Diff: sky/engine/core/html/HTMLImageElement.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
« no previous file with comments | « sky/engine/core/frame/FrameView.cpp ('k') | sky/engine/core/rendering/FilterEffectRenderer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/html/HTMLImageElement.cpp
diff --git a/sky/engine/core/html/HTMLImageElement.cpp b/sky/engine/core/html/HTMLImageElement.cpp
index d4b6c227b2b557c8ce9521a38fad2a67d0fcc85d..768c5680768c64889b2b04dd3d212f36e696b202 100644
--- a/sky/engine/core/html/HTMLImageElement.cpp
+++ b/sky/engine/core/html/HTMLImageElement.cpp
@@ -241,7 +241,7 @@ int HTMLImageElement::width(bool ignorePendingStylesheets)
// if the image is available, use its width
if (imageLoader().image())
- return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f).width();
+ return imageLoader().image()->imageSizeForRenderer(renderer()).width();
}
if (ignorePendingStylesheets)
@@ -264,7 +264,7 @@ int HTMLImageElement::height(bool ignorePendingStylesheets)
// if the image is available, use its height
if (imageLoader().image())
- return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f).height();
+ return imageLoader().image()->imageSizeForRenderer(renderer()).height();
}
if (ignorePendingStylesheets)
@@ -281,7 +281,7 @@ int HTMLImageElement::naturalWidth() const
if (!imageLoader().image())
return 0;
- return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f, ImageResource::IntrinsicSize).width();
+ return imageLoader().image()->imageSizeForRenderer(renderer(), ImageResource::IntrinsicSize).width();
}
int HTMLImageElement::naturalHeight() const
@@ -289,7 +289,7 @@ int HTMLImageElement::naturalHeight() const
if (!imageLoader().image())
return 0;
- return imageLoader().image()->imageSizeForRenderer(renderer(), 1.0f, ImageResource::IntrinsicSize).height();
+ return imageLoader().image()->imageSizeForRenderer(renderer(), ImageResource::IntrinsicSize).height();
}
const String& HTMLImageElement::currentSrc() const
@@ -400,10 +400,7 @@ FloatSize HTMLImageElement::sourceSize() const
ImageResource* image = cachedImage();
if (!image)
return FloatSize();
- LayoutSize size;
- size = image->imageSizeForRenderer(renderer(), 1.0f); // FIXME: Not sure about this.
-
- return size;
+ return image->imageSizeForRenderer(renderer()); // FIXME: Not sure about this.
}
FloatSize HTMLImageElement::defaultDestinationSize() const
@@ -412,7 +409,7 @@ FloatSize HTMLImageElement::defaultDestinationSize() const
if (!image)
return FloatSize();
LayoutSize size;
- size = image->imageSizeForRenderer(renderer(), 1.0f); // FIXME: Not sure about this.
+ size = image->imageSizeForRenderer(renderer()); // FIXME: Not sure about this.
if (renderer() && renderer()->isRenderImage() && image->image() && !image->image()->hasRelativeWidth())
size.scale(toRenderImage(renderer())->imageDevicePixelRatio());
return size;
« no previous file with comments | « sky/engine/core/frame/FrameView.cpp ('k') | sky/engine/core/rendering/FilterEffectRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698