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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/Image.h

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) 2006 Samuel Weinig (sam.weinig@gmail.com) 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // Derived classes should override this if they can assure that the current 86 // Derived classes should override this if they can assure that the current
87 // image frame contains only resources from its own security origin. 87 // image frame contains only resources from its own security origin.
88 virtual bool currentFrameHasSingleSecurityOrigin() const { return false; } 88 virtual bool currentFrameHasSingleSecurityOrigin() const { return false; }
89 89
90 static Image* nullImage(); 90 static Image* nullImage();
91 bool isNull() const { return size().isEmpty(); } 91 bool isNull() const { return size().isEmpty(); }
92 92
93 virtual bool usesContainerSize() const { return false; } 93 virtual bool usesContainerSize() const { return false; }
94 virtual bool hasRelativeSize() const { return false; } 94 virtual bool hasRelativeSize() const { return false; }
95 95
96 // Computes (extracts) the intrinsic dimensions and ratio from the Image. Th e intrinsic ratio
97 // will be the 'viewport' of the image. (Same as the dimensions for a raster image. For SVG
98 // images it can be the dimensions defined by the 'viewBox'.)
99 virtual void computeIntrinsicDimensions(FloatSize& intrinsicSize, FloatSize& intrinsicRatio);
100
101 virtual IntSize size() const = 0; 96 virtual IntSize size() const = 0;
102 IntRect rect() const { return IntRect(IntPoint(), size()); } 97 IntRect rect() const { return IntRect(IntPoint(), size()); }
103 int width() const { return size().width(); } 98 int width() const { return size().width(); }
104 int height() const { return size().height(); } 99 int height() const { return size().height(); }
105 virtual bool getHotSpot(IntPoint&) const { return false; } 100 virtual bool getHotSpot(IntPoint&) const { return false; }
106 101
107 bool setData(PassRefPtr<SharedBuffer> data, bool allDataReceived); 102 bool setData(PassRefPtr<SharedBuffer> data, bool allDataReceived);
108 virtual bool dataChanged(bool /*allDataReceived*/) { return false; } 103 virtual bool dataChanged(bool /*allDataReceived*/) { return false; }
109 104
110 virtual String filenameExtension() const { return String(); } // null string if unknown 105 virtual String filenameExtension() const { return String(); } // null string if unknown
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // being responsible of clearing itself out. 164 // being responsible of clearing itself out.
170 RawPtrWillBeUntracedMember<ImageObserver> m_imageObserver; 165 RawPtrWillBeUntracedMember<ImageObserver> m_imageObserver;
171 }; 166 };
172 167
173 #define DEFINE_IMAGE_TYPE_CASTS(typeName) \ 168 #define DEFINE_IMAGE_TYPE_CASTS(typeName) \
174 DEFINE_TYPE_CASTS(typeName, Image, image, image->is##typeName(), image.is##t ypeName()) 169 DEFINE_TYPE_CASTS(typeName, Image, image, image->is##typeName(), image.is##t ypeName())
175 170
176 } // namespace blink 171 } // namespace blink
177 172
178 #endif 173 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698