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

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

Issue 1335183002: Change CSSImageValue's member variables from String to AtomicString (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: (rebase) 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
« no previous file with comments | « no previous file | Source/core/css/CSSImageValue.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2008, 2012 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 20 matching lines...) Expand all
31 class Document; 31 class Document;
32 class KURL; 32 class KURL;
33 class StyleFetchedImage; 33 class StyleFetchedImage;
34 class StyleImage; 34 class StyleImage;
35 class LayoutObject; 35 class LayoutObject;
36 36
37 class CSSImageValue : public CSSValue { 37 class CSSImageValue : public CSSValue {
38 public: 38 public:
39 static PassRefPtrWillBeRawPtr<CSSImageValue> create(const KURL& url, StyleIm age* image = 0) 39 static PassRefPtrWillBeRawPtr<CSSImageValue> create(const KURL& url, StyleIm age* image = 0)
40 { 40 {
41 return adoptRefWillBeNoop(new CSSImageValue(url, url, image)); 41 return create(url.string(), url, image);
42 } 42 }
43 static PassRefPtrWillBeRawPtr<CSSImageValue> create(const String& rawValue, const KURL& url, StyleImage* image = 0) 43 static PassRefPtrWillBeRawPtr<CSSImageValue> create(const String& rawValue, const KURL& url, StyleImage* image = 0)
44 { 44 {
45 return create(AtomicString(rawValue), url, image);
46 }
47 static PassRefPtrWillBeRawPtr<CSSImageValue> create(const AtomicString& rawV alue, const KURL& url, StyleImage* image = 0)
48 {
45 return adoptRefWillBeNoop(new CSSImageValue(rawValue, url, image)); 49 return adoptRefWillBeNoop(new CSSImageValue(rawValue, url, image));
46 } 50 }
47 ~CSSImageValue(); 51 ~CSSImageValue();
48 52
49 StyleFetchedImage* cachedImage(Document*, const ResourceLoaderOptions&); 53 StyleFetchedImage* cachedImage(Document*, const ResourceLoaderOptions&);
50 StyleFetchedImage* cachedImage(Document* document) { return cachedImage(docu ment, ResourceFetcher::defaultResourceOptions()); } 54 StyleFetchedImage* cachedImage(Document* document) { return cachedImage(docu ment, ResourceFetcher::defaultResourceOptions()); }
51 // Returns a StyleFetchedImage if the image is cached already, otherwise a S tylePendingImage. 55 // Returns a StyleFetchedImage if the image is cached already, otherwise a S tylePendingImage.
52 StyleImage* cachedOrPendingImage(); 56 StyleImage* cachedOrPendingImage();
53 57
54 const String& url() { return m_absoluteURL; } 58 const String& url() { return m_absoluteURL; }
(...skipping 10 matching lines...) Expand all
65 bool equals(const CSSImageValue&) const; 69 bool equals(const CSSImageValue&) const;
66 70
67 bool knownToBeOpaque(const LayoutObject*) const; 71 bool knownToBeOpaque(const LayoutObject*) const;
68 72
69 void setInitiator(const AtomicString& name) { m_initiatorName = name; } 73 void setInitiator(const AtomicString& name) { m_initiatorName = name; }
70 74
71 DECLARE_TRACE_AFTER_DISPATCH(); 75 DECLARE_TRACE_AFTER_DISPATCH();
72 void restoreCachedResourceIfNeeded(Document&); 76 void restoreCachedResourceIfNeeded(Document&);
73 77
74 private: 78 private:
75 CSSImageValue(const String& rawValue, const KURL&, StyleImage*); 79 CSSImageValue(const AtomicString& rawValue, const KURL&, StyleImage*);
76 80
77 String m_relativeURL; 81 AtomicString m_relativeURL;
78 String m_absoluteURL; 82 AtomicString m_absoluteURL;
79 Referrer m_referrer; 83 Referrer m_referrer;
80 RefPtrWillBeMember<StyleImage> m_image; 84 RefPtrWillBeMember<StyleImage> m_image;
81 bool m_accessedImage; 85 bool m_accessedImage;
82 AtomicString m_initiatorName; 86 AtomicString m_initiatorName;
83 }; 87 };
84 88
85 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageValue, isImageValue()); 89 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageValue, isImageValue());
86 90
87 } // namespace blink 91 } // namespace blink
88 92
89 #endif // CSSImageValue_h 93 #endif // CSSImageValue_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSImageValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698