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

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

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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 | « Source/core/css/StyleMedia.h ('k') | Source/core/css/TreeBoundaryCrossingRules.h » ('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 * (C) 2002-2003 Dirk Mueller (mueller@kde.org) 3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2002, 2006, 2008, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2002, 2006, 2008, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 MediaQuerySet* mediaQueries() { return m_mediaQueries.get(); } 51 MediaQuerySet* mediaQueries() { return m_mediaQueries.get(); }
52 52
53 void requestStyleSheet(); 53 void requestStyleSheet();
54 54
55 void traceAfterDispatch(Visitor*); 55 void traceAfterDispatch(Visitor*);
56 56
57 private: 57 private:
58 // FIXME: inherit from StyleSheetResourceClient directly to eliminate raw ba ck pointer, as there are no space savings in this. 58 // FIXME: inherit from StyleSheetResourceClient directly to eliminate raw ba ck pointer, as there are no space savings in this.
59 // NOTE: We put the StyleSheetResourceClient in a member instead of inheriti ng from it 59 // NOTE: We put the StyleSheetResourceClient in a member instead of inheriti ng from it
60 // to avoid adding a vptr to StyleRuleImport. 60 // to avoid adding a vptr to StyleRuleImport.
61 class ImportedStyleSheetClient FINAL : public StyleSheetResourceClient { 61 class ImportedStyleSheetClient final : public StyleSheetResourceClient {
62 public: 62 public:
63 ImportedStyleSheetClient(StyleRuleImport* ownerRule) : m_ownerRule(owner Rule) { } 63 ImportedStyleSheetClient(StyleRuleImport* ownerRule) : m_ownerRule(owner Rule) { }
64 virtual ~ImportedStyleSheetClient() { } 64 virtual ~ImportedStyleSheetClient() { }
65 virtual void setCSSStyleSheet(const String& href, const KURL& baseURL, c onst String& charset, const CSSStyleSheetResource* sheet) OVERRIDE 65 virtual void setCSSStyleSheet(const String& href, const KURL& baseURL, c onst String& charset, const CSSStyleSheetResource* sheet) override
66 { 66 {
67 m_ownerRule->setCSSStyleSheet(href, baseURL, charset, sheet); 67 m_ownerRule->setCSSStyleSheet(href, baseURL, charset, sheet);
68 } 68 }
69 private: 69 private:
70 StyleRuleImport* m_ownerRule; 70 StyleRuleImport* m_ownerRule;
71 }; 71 };
72 72
73 void setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CSSStyleSheetResource*); 73 void setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CSSStyleSheetResource*);
74 friend class ImportedStyleSheetClient; 74 friend class ImportedStyleSheetClient;
75 75
76 StyleRuleImport(const String& href, PassRefPtrWillBeRawPtr<MediaQuerySet>); 76 StyleRuleImport(const String& href, PassRefPtrWillBeRawPtr<MediaQuerySet>);
77 77
78 RawPtrWillBeMember<StyleSheetContents> m_parentStyleSheet; 78 RawPtrWillBeMember<StyleSheetContents> m_parentStyleSheet;
79 79
80 ImportedStyleSheetClient m_styleSheetClient; 80 ImportedStyleSheetClient m_styleSheetClient;
81 String m_strHref; 81 String m_strHref;
82 RefPtrWillBeMember<MediaQuerySet> m_mediaQueries; 82 RefPtrWillBeMember<MediaQuerySet> m_mediaQueries;
83 RefPtrWillBeMember<StyleSheetContents> m_styleSheet; 83 RefPtrWillBeMember<StyleSheetContents> m_styleSheet;
84 ResourcePtr<CSSStyleSheetResource> m_resource; 84 ResourcePtr<CSSStyleSheetResource> m_resource;
85 bool m_loading; 85 bool m_loading;
86 }; 86 };
87 87
88 DEFINE_STYLE_RULE_TYPE_CASTS(Import); 88 DEFINE_STYLE_RULE_TYPE_CASTS(Import);
89 89
90 } // namespace blink 90 } // namespace blink
91 91
92 #endif 92 #endif
OLDNEW
« no previous file with comments | « Source/core/css/StyleMedia.h ('k') | Source/core/css/TreeBoundaryCrossingRules.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698