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

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

Issue 1720853002: Remove Image::computeIntrinsicDimensions() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-and-use-updateconcretesize-upload
Patch Set: Avoid using the size of the error image. Null-check in ImageResource saved the day in previous patc… Created 4 years, 9 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // 102 //
103 // https://drafts.csswg.org/css-images-3/#the-image-orientation 103 // https://drafts.csswg.org/css-images-3/#the-image-orientation
104 return m_image->imageSize(DoNotRespectImageOrientation, multiplier); 104 return m_image->imageSize(DoNotRespectImageOrientation, multiplier);
105 } 105 }
106 106
107 bool StyleFetchedImage::imageHasRelativeSize() const 107 bool StyleFetchedImage::imageHasRelativeSize() const
108 { 108 {
109 return m_image->imageHasRelativeSize(); 109 return m_image->imageHasRelativeSize();
110 } 110 }
111 111
112 void StyleFetchedImage::computeIntrinsicDimensions(const LayoutObject*, FloatSiz e& intrinsicSize, FloatSize& intrinsicRatio)
113 {
114 m_image->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio);
115 }
116
117 bool StyleFetchedImage::usesImageContainerSize() const 112 bool StyleFetchedImage::usesImageContainerSize() const
118 { 113 {
119 return m_image->usesImageContainerSize(); 114 return m_image->usesImageContainerSize();
120 } 115 }
121 116
122 void StyleFetchedImage::addClient(LayoutObject* layoutObject) 117 void StyleFetchedImage::addClient(LayoutObject* layoutObject)
123 { 118 {
124 m_image->addClient(layoutObject); 119 m_image->addClient(layoutObject);
125 } 120 }
126 121
(...skipping 25 matching lines...) Expand all
152 } 147 }
153 148
154 DEFINE_TRACE(StyleFetchedImage) 149 DEFINE_TRACE(StyleFetchedImage)
155 { 150 {
156 visitor->trace(m_image); 151 visitor->trace(m_image);
157 visitor->trace(m_document); 152 visitor->trace(m_document);
158 StyleImage::trace(visitor); 153 StyleImage::trace(visitor);
159 } 154 }
160 155
161 } // namespace blink 156 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698