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

Side by Side Diff: third_party/WebKit/Source/core/css/StyleRule.cpp

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-3: . Created 4 years, 9 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 * (C) 2002-2003 Dirk Mueller (mueller@kde.org) 3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2002, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2002, 2005, 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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 m_properties = m_properties->mutableCopy(); 334 m_properties = m_properties->mutableCopy();
335 return *toMutableStylePropertySet(m_properties); 335 return *toMutableStylePropertySet(m_properties);
336 } 336 }
337 337
338 DEFINE_TRACE_AFTER_DISPATCH(StyleRuleFontFace) 338 DEFINE_TRACE_AFTER_DISPATCH(StyleRuleFontFace)
339 { 339 {
340 visitor->trace(m_properties); 340 visitor->trace(m_properties);
341 StyleRuleBase::traceAfterDispatch(visitor); 341 StyleRuleBase::traceAfterDispatch(visitor);
342 } 342 }
343 343
344 StyleRuleGroup::StyleRuleGroup(Type type, WillBeHeapVector<RefPtrWillBeMember<St yleRuleBase>>& adoptRule) 344 StyleRuleGroup::StyleRuleGroup(RuleType type, WillBeHeapVector<RefPtrWillBeMembe r<StyleRuleBase>>& adoptRule)
345 : StyleRuleBase(type) 345 : StyleRuleBase(type)
346 { 346 {
347 m_childRules.swap(adoptRule); 347 m_childRules.swap(adoptRule);
348 } 348 }
349 349
350 StyleRuleGroup::StyleRuleGroup(const StyleRuleGroup& o) 350 StyleRuleGroup::StyleRuleGroup(const StyleRuleGroup& o)
351 : StyleRuleBase(o) 351 : StyleRuleBase(o)
352 , m_childRules(o.m_childRules.size()) 352 , m_childRules(o.m_childRules.size())
353 { 353 {
354 for (unsigned i = 0; i < m_childRules.size(); ++i) 354 for (unsigned i = 0; i < m_childRules.size(); ++i)
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 return *toMutableStylePropertySet(m_properties); 427 return *toMutableStylePropertySet(m_properties);
428 } 428 }
429 429
430 DEFINE_TRACE_AFTER_DISPATCH(StyleRuleViewport) 430 DEFINE_TRACE_AFTER_DISPATCH(StyleRuleViewport)
431 { 431 {
432 visitor->trace(m_properties); 432 visitor->trace(m_properties);
433 StyleRuleBase::traceAfterDispatch(visitor); 433 StyleRuleBase::traceAfterDispatch(visitor);
434 } 434 }
435 435
436 } // namespace blink 436 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/StyleRule.h ('k') | third_party/WebKit/Source/core/css/parser/CSSParserImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698