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

Side by Side Diff: third_party/WebKit/Source/core/style/ContentData.h

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights
6 * reserved. 6 * reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 bool isCounter() const override { return true; } 145 bool isCounter() const override { return true; }
146 LayoutObject* createLayoutObject(Document&, ComputedStyle&) const override; 146 LayoutObject* createLayoutObject(Document&, ComputedStyle&) const override;
147 147
148 private: 148 private:
149 CounterContentData(std::unique_ptr<CounterContent> counter) 149 CounterContentData(std::unique_ptr<CounterContent> counter)
150 : m_counter(std::move(counter)) {} 150 : m_counter(std::move(counter)) {}
151 151
152 ContentData* cloneInternal() const override { 152 ContentData* cloneInternal() const override {
153 std::unique_ptr<CounterContent> counterData = 153 std::unique_ptr<CounterContent> counterData =
154 wrapUnique(new CounterContent(*counter())); 154 WTF::wrapUnique(new CounterContent(*counter()));
155 return create(std::move(counterData)); 155 return create(std::move(counterData));
156 } 156 }
157 157
158 bool equals(const ContentData& data) const override { 158 bool equals(const ContentData& data) const override {
159 if (!data.isCounter()) 159 if (!data.isCounter())
160 return false; 160 return false;
161 return *static_cast<const CounterContentData&>(data).counter() == 161 return *static_cast<const CounterContentData&>(data).counter() ==
162 *counter(); 162 *counter();
163 } 163 }
164 164
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 return a.equals(b); 197 return a.equals(b);
198 } 198 }
199 199
200 inline bool operator!=(const ContentData& a, const ContentData& b) { 200 inline bool operator!=(const ContentData& a, const ContentData& b) {
201 return !(a == b); 201 return !(a == b);
202 } 202 }
203 203
204 } // namespace blink 204 } // namespace blink
205 205
206 #endif // ContentData_h 206 #endif // ContentData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.cpp ('k') | third_party/WebKit/Source/core/style/CounterDirectives.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698