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

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

Issue 1306283006: BackgroundImage incorrectly returns empty url() when created on-the-fly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Ensure getComputedStyle returns absolute URLs Created 5 years, 3 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class StylePendingImage final : public StyleImage { 42 class StylePendingImage final : public StyleImage {
43 public: 43 public:
44 static PassRefPtrWillBeRawPtr<StylePendingImage> create(CSSValue* value) 44 static PassRefPtrWillBeRawPtr<StylePendingImage> create(CSSValue* value)
45 { 45 {
46 return adoptRefWillBeNoop(new StylePendingImage(value)); 46 return adoptRefWillBeNoop(new StylePendingImage(value));
47 } 47 }
48 48
49 WrappedImagePtr data() const override { return m_value; } 49 WrappedImagePtr data() const override { return m_value; }
50 50
51 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return m_value; } 51 PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return m_value; }
52
53 PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override
54 {
55 return (m_value && m_value->isImageValue()) ? toCSSImageValue(m_value)-> valueWithAbsoluteURL() : nullptr;
Timothy Loh 2015/09/15 12:20:47 Does this function ever get reached?
nainar 2015/09/16 07:16:49 Removed.
56 }
52 CSSImageValue* cssImageValue() const { return m_value->isImageValue() ? toCS SImageValue(m_value) : 0; } 57 CSSImageValue* cssImageValue() const { return m_value->isImageValue() ? toCS SImageValue(m_value) : 0; }
53 CSSImageGeneratorValue* cssImageGeneratorValue() const { return m_value->isI mageGeneratorValue() ? toCSSImageGeneratorValue(m_value) : 0; } 58 CSSImageGeneratorValue* cssImageGeneratorValue() const { return m_value->isI mageGeneratorValue() ? toCSSImageGeneratorValue(m_value) : 0; }
54 CSSCursorImageValue* cssCursorImageValue() const { return m_value->isCursorI mageValue() ? toCSSCursorImageValue(m_value) : 0; } 59 CSSCursorImageValue* cssCursorImageValue() const { return m_value->isCursorI mageValue() ? toCSSCursorImageValue(m_value) : 0; }
55 CSSImageSetValue* cssImageSetValue() const { return m_value->isImageSetValue () ? toCSSImageSetValue(m_value) : 0; } 60 CSSImageSetValue* cssImageSetValue() const { return m_value->isImageSetValue () ? toCSSImageSetValue(m_value) : 0; }
56 61
57 LayoutSize imageSize(const LayoutObject*, float /*multiplier*/) const overri de { return LayoutSize(); } 62 LayoutSize imageSize(const LayoutObject*, float /*multiplier*/) const overri de { return LayoutSize(); }
58 bool imageHasRelativeWidth() const override { return false; } 63 bool imageHasRelativeWidth() const override { return false; }
59 bool imageHasRelativeHeight() const override { return false; } 64 bool imageHasRelativeHeight() const override { return false; }
60 void computeIntrinsicDimensions(const LayoutObject*, Length& /* intrinsicWid th */ , Length& /* intrinsicHeight */, FloatSize& /* intrinsicRatio */) override { } 65 void computeIntrinsicDimensions(const LayoutObject*, Length& /* intrinsicWid th */ , Length& /* intrinsicHeight */, FloatSize& /* intrinsicRatio */) override { }
61 bool usesImageContainerSize() const override { return false; } 66 bool usesImageContainerSize() const override { return false; }
(...skipping 20 matching lines...) Expand all
82 m_isPendingImage = true; 87 m_isPendingImage = true;
83 } 88 }
84 89
85 RawPtrWillBeMember<CSSValue> m_value; // Not retained; it owns us. 90 RawPtrWillBeMember<CSSValue> m_value; // Not retained; it owns us.
86 }; 91 };
87 92
88 DEFINE_STYLE_IMAGE_TYPE_CASTS(StylePendingImage, isPendingImage()); 93 DEFINE_STYLE_IMAGE_TYPE_CASTS(StylePendingImage, isPendingImage());
89 94
90 } 95 }
91 #endif 96 #endif
OLDNEW
« Source/core/style/StyleGeneratedImage.cpp ('K') | « Source/core/style/StyleImage.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698