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

Side by Side Diff: third_party/WebKit/Source/core/style/StyleFetchedImage.cpp

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 bool StyleFetchedImage::isLoaded() const 84 bool StyleFetchedImage::isLoaded() const
85 { 85 {
86 return m_image->isLoaded(); 86 return m_image->isLoaded();
87 } 87 }
88 88
89 bool StyleFetchedImage::errorOccurred() const 89 bool StyleFetchedImage::errorOccurred() const
90 { 90 {
91 return m_image->errorOccurred(); 91 return m_image->errorOccurred();
92 } 92 }
93 93
94 LayoutSize StyleFetchedImage::imageSize(const LayoutObject* layoutObject, float multiplier) const 94 LayoutSize StyleFetchedImage::concreteObjectSize(const LayoutObject* layoutObjec t, const FloatSize& defaultObjectSize, float multiplier) const
95 { 95 {
96 return m_image->imageSize(LayoutObject::shouldRespectImageOrientation(layout Object), multiplier); 96 return m_image->concreteObjectSize(defaultObjectSize, LayoutObject::shouldRe spectImageOrientation(layoutObject), multiplier);
97 } 97 }
98 98
99 bool StyleFetchedImage::imageHasRelativeSize() const 99 bool StyleFetchedImage::imageHasRelativeSize() const
100 { 100 {
101 return m_image->imageHasRelativeSize(); 101 return m_image->imageHasRelativeSize();
102 } 102 }
103 103
104 void StyleFetchedImage::computeIntrinsicDimensions(const LayoutObject*, FloatSiz e& intrinsicSize, FloatSize& intrinsicRatio) 104 void StyleFetchedImage::computeIntrinsicDimensions(const LayoutObject*, FloatSiz e& intrinsicSize, FloatSize& intrinsicRatio)
105 { 105 {
106 m_image->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio); 106 m_image->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 } 144 }
145 145
146 DEFINE_TRACE(StyleFetchedImage) 146 DEFINE_TRACE(StyleFetchedImage)
147 { 147 {
148 visitor->trace(m_image); 148 visitor->trace(m_image);
149 visitor->trace(m_document); 149 visitor->trace(m_document);
150 StyleImage::trace(visitor); 150 StyleImage::trace(visitor);
151 } 151 }
152 152
153 } // namespace blink 153 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/StyleFetchedImage.h ('k') | third_party/WebKit/Source/core/style/StyleFetchedImageSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698