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

Side by Side Diff: Source/core/css/CSSImageValue.cpp

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: Change StyleFetchedImage 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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return true; 101 return true;
102 } 102 }
103 103
104 bool CSSImageValue::equals(const CSSImageValue& other) const 104 bool CSSImageValue::equals(const CSSImageValue& other) const
105 { 105 {
106 return m_absoluteURL == other.m_absoluteURL; 106 return m_absoluteURL == other.m_absoluteURL;
107 } 107 }
108 108
109 String CSSImageValue::customCSSText() const 109 String CSSImageValue::customCSSText() const
110 { 110 {
111 return "url(" + quoteCSSURLIfNeeded(m_absoluteURL) + ")"; 111 // TODO(nainar): Serialise with quotation marks to match spec: https://draft s.csswg.org/cssom/#serialize-a-string
Timothy Loh 2015/09/22 05:53:27 https://drafts.csswg.org/cssom/#serialize-a-url ?
nainar 2015/09/22 06:14:16 Done.
112 return "url(" + quoteCSSURLIfNeeded(serializeStringWithoutQuotations(m_relat iveURL)) + ")";
112 } 113 }
113 114
114 bool CSSImageValue::knownToBeOpaque(const LayoutObject* layoutObject) const 115 bool CSSImageValue::knownToBeOpaque(const LayoutObject* layoutObject) const
115 { 116 {
116 return m_image ? m_image->knownToBeOpaque(layoutObject) : false; 117 return m_image ? m_image->knownToBeOpaque(layoutObject) : false;
117 } 118 }
118 119
119 DEFINE_TRACE_AFTER_DISPATCH(CSSImageValue) 120 DEFINE_TRACE_AFTER_DISPATCH(CSSImageValue)
120 { 121 {
121 visitor->trace(m_image); 122 visitor->trace(m_image);
122 CSSValue::traceAfterDispatch(visitor); 123 CSSValue::traceAfterDispatch(visitor);
123 } 124 }
124 125
125 void CSSImageValue::reResolveURL(const Document& document) 126 void CSSImageValue::reResolveURL(const Document& document)
126 { 127 {
127 KURL url = document.completeURL(m_relativeURL); 128 KURL url = document.completeURL(m_relativeURL);
128 if (url == m_absoluteURL) 129 if (url == m_absoluteURL)
129 return; 130 return;
130 m_absoluteURL = url.string(); 131 m_absoluteURL = url.string();
131 m_accessedImage = false; 132 m_accessedImage = false;
132 m_image.clear(); 133 m_image.clear();
133 } 134 }
134 135
135 } // namespace blink 136 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698