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

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

Issue 1468023002: Rename imageSizeForLayoutObject() to imageSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bring back ps#3 and fix nit Created 5 years 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 return m_image->isLoaded(); 76 return m_image->isLoaded();
77 } 77 }
78 78
79 bool StyleFetchedImage::errorOccurred() const 79 bool StyleFetchedImage::errorOccurred() const
80 { 80 {
81 return m_image->errorOccurred(); 81 return m_image->errorOccurred();
82 } 82 }
83 83
84 LayoutSize StyleFetchedImage::imageSize(const LayoutObject* layoutObject, float multiplier) const 84 LayoutSize StyleFetchedImage::imageSize(const LayoutObject* layoutObject, float multiplier) const
85 { 85 {
86 return m_image->imageSizeForLayoutObject(layoutObject, multiplier); 86 return m_image->imageSize(LayoutObject::shouldRespectImageOrientation(layout Object), multiplier);
87 } 87 }
88 88
89 bool StyleFetchedImage::imageHasRelativeWidth() const 89 bool StyleFetchedImage::imageHasRelativeWidth() const
90 { 90 {
91 return m_image->imageHasRelativeWidth(); 91 return m_image->imageHasRelativeWidth();
92 } 92 }
93 93
94 bool StyleFetchedImage::imageHasRelativeHeight() const 94 bool StyleFetchedImage::imageHasRelativeHeight() const
95 { 95 {
96 return m_image->imageHasRelativeHeight(); 96 return m_image->imageHasRelativeHeight();
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 return m_image->currentFrameKnownToBeOpaque(layoutObject); 137 return m_image->currentFrameKnownToBeOpaque(layoutObject);
138 } 138 }
139 139
140 DEFINE_TRACE(StyleFetchedImage) 140 DEFINE_TRACE(StyleFetchedImage)
141 { 141 {
142 visitor->trace(m_document); 142 visitor->trace(m_document);
143 StyleImage::trace(visitor); 143 StyleImage::trace(visitor);
144 } 144 }
145 145
146 } 146 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/paint/ImagePainter.cpp ('k') | third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698