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

Side by Side Diff: third_party/WebKit/Source/core/style/StylePendingImage.h

Issue 1756763004: Merge image sizing algorithms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Break out common code to StyleImage and fold constant into call 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) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 { 54 {
55 ASSERT_NOT_REACHED(); 55 ASSERT_NOT_REACHED();
56 return nullptr; 56 return nullptr;
57 } 57 }
58 58
59 CSSImageValue* cssImageValue() const { return m_value->isImageValue() ? toCS SImageValue(m_value.get()) : 0; } 59 CSSImageValue* cssImageValue() const { return m_value->isImageValue() ? toCS SImageValue(m_value.get()) : 0; }
60 CSSImageGeneratorValue* cssImageGeneratorValue() const { return m_value->isI mageGeneratorValue() ? toCSSImageGeneratorValue(m_value.get()) : 0; } 60 CSSImageGeneratorValue* cssImageGeneratorValue() const { return m_value->isI mageGeneratorValue() ? toCSSImageGeneratorValue(m_value.get()) : 0; }
61 CSSCursorImageValue* cssCursorImageValue() const { return m_value->isCursorI mageValue() ? toCSSCursorImageValue(m_value.get()) : 0; } 61 CSSCursorImageValue* cssCursorImageValue() const { return m_value->isCursorI mageValue() ? toCSSCursorImageValue(m_value.get()) : 0; }
62 CSSImageSetValue* cssImageSetValue() const { return m_value->isImageSetValue () ? toCSSImageSetValue(m_value.get()) : 0; } 62 CSSImageSetValue* cssImageSetValue() const { return m_value->isImageSetValue () ? toCSSImageSetValue(m_value.get()) : 0; }
63 63
64 LayoutSize imageSize(const LayoutObject*, float /*multiplier*/) const overri de { return LayoutSize(); } 64 LayoutSize imageSize(const LayoutObject*, float /*multiplier*/, const Layout Size& /*defaultObjectSize*/) const override { return LayoutSize(); }
65 bool imageHasRelativeSize() const override { return false; } 65 bool imageHasRelativeSize() const override { return false; }
66 void computeIntrinsicDimensions(const LayoutObject*, FloatSize& /* intrinsic Size */, FloatSize& /* intrinsicRatio */) override { } 66 void computeIntrinsicDimensions(const LayoutObject*, FloatSize& /* intrinsic Size */, FloatSize& /* intrinsicRatio */) override { }
67 bool usesImageContainerSize() const override { return false; } 67 bool usesImageContainerSize() const override { return false; }
68 void addClient(LayoutObject*) override { } 68 void addClient(LayoutObject*) override { }
69 void removeClient(LayoutObject*) override { } 69 void removeClient(LayoutObject*) override { }
70 PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const ov erride 70 PassRefPtr<Image> image(const LayoutObject*, const IntSize&, float) const ov erride
71 { 71 {
72 ASSERT_NOT_REACHED(); 72 ASSERT_NOT_REACHED();
73 return nullptr; 73 return nullptr;
74 } 74 }
(...skipping 14 matching lines...) Expand all
89 89
90 // TODO(sashab): Replace this with <const CSSValue> once RefPtrWillBeMember< > 90 // TODO(sashab): Replace this with <const CSSValue> once RefPtrWillBeMember< >
91 // supports const types. 91 // supports const types.
92 RefPtrWillBeMember<CSSValue> m_value; 92 RefPtrWillBeMember<CSSValue> m_value;
93 }; 93 };
94 94
95 DEFINE_STYLE_IMAGE_TYPE_CASTS(StylePendingImage, isPendingImage()); 95 DEFINE_STYLE_IMAGE_TYPE_CASTS(StylePendingImage, isPendingImage());
96 96
97 } // namespace blink 97 } // namespace blink
98 #endif 98 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698