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

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

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 * (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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 void requestStyleSheet(); 53 void requestStyleSheet();
54 54
55 DECLARE_TRACE_AFTER_DISPATCH(); 55 DECLARE_TRACE_AFTER_DISPATCH();
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 DISALLOW_ALLOCATION(); 62 DISALLOW_NEW();
63 public: 63 public:
64 ImportedStyleSheetClient(StyleRuleImport* ownerRule) : m_ownerRule(owner Rule) { } 64 ImportedStyleSheetClient(StyleRuleImport* ownerRule) : m_ownerRule(owner Rule) { }
65 ~ImportedStyleSheetClient() override { } 65 ~ImportedStyleSheetClient() override { }
66 void setCSSStyleSheet(const String& href, const KURL& baseURL, const Str ing& charset, const CSSStyleSheetResource* sheet) override 66 void setCSSStyleSheet(const String& href, const KURL& baseURL, const Str ing& charset, const CSSStyleSheetResource* sheet) override
67 { 67 {
68 m_ownerRule->setCSSStyleSheet(href, baseURL, charset, sheet); 68 m_ownerRule->setCSSStyleSheet(href, baseURL, charset, sheet);
69 } 69 }
70 private: 70 private:
71 StyleRuleImport* m_ownerRule; 71 StyleRuleImport* m_ownerRule;
72 }; 72 };
(...skipping 11 matching lines...) Expand all
84 RefPtrWillBeMember<StyleSheetContents> m_styleSheet; 84 RefPtrWillBeMember<StyleSheetContents> m_styleSheet;
85 ResourcePtr<CSSStyleSheetResource> m_resource; 85 ResourcePtr<CSSStyleSheetResource> m_resource;
86 bool m_loading; 86 bool m_loading;
87 }; 87 };
88 88
89 DEFINE_STYLE_RULE_TYPE_CASTS(Import); 89 DEFINE_STYLE_RULE_TYPE_CASTS(Import);
90 90
91 } // namespace blink 91 } // namespace blink
92 92
93 #endif 93 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698