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

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

Issue 2555923002: Changed TextDirection to an enum class and renamed its members (Closed)
Patch Set: Added 2 changes in mac files 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 collector.addElementStyleProperties( 528 collector.addElementStyleProperties(
529 state.element()->additionalPresentationAttributeStyle()); 529 state.element()->additionalPresentationAttributeStyle());
530 530
531 if (state.element()->isHTMLElement()) { 531 if (state.element()->isHTMLElement()) {
532 bool isAuto; 532 bool isAuto;
533 TextDirection textDirection = 533 TextDirection textDirection =
534 toHTMLElement(state.element()) 534 toHTMLElement(state.element())
535 ->directionalityIfhasDirAutoAttribute(isAuto); 535 ->directionalityIfhasDirAutoAttribute(isAuto);
536 if (isAuto) { 536 if (isAuto) {
537 state.setHasDirAutoAttribute(true); 537 state.setHasDirAutoAttribute(true);
538 collector.addElementStyleProperties(textDirection == LTR 538 collector.addElementStyleProperties(textDirection == TextDirection::Ltr
539 ? leftToRightDeclaration() 539 ? leftToRightDeclaration()
540 : rightToLeftDeclaration()); 540 : rightToLeftDeclaration());
541 } 541 }
542 } 542 }
543 } 543 }
544 544
545 matchAuthorRules(*state.element(), collector); 545 matchAuthorRules(*state.element(), collector);
546 546
547 if (state.element()->isStyledElement()) { 547 if (state.element()->isStyledElement()) {
548 // For Shadow DOM V1, inline style is already collected in 548 // For Shadow DOM V1, inline style is already collected in
(...skipping 1418 matching lines...) Expand 10 before | Expand all | Expand 10 after
1967 DEFINE_TRACE(StyleResolver) { 1967 DEFINE_TRACE(StyleResolver) {
1968 visitor->trace(m_matchedPropertiesCache); 1968 visitor->trace(m_matchedPropertiesCache);
1969 visitor->trace(m_selectorFilter); 1969 visitor->trace(m_selectorFilter);
1970 visitor->trace(m_styleSharingLists); 1970 visitor->trace(m_styleSharingLists);
1971 visitor->trace(m_pendingStyleSheets); 1971 visitor->trace(m_pendingStyleSheets);
1972 visitor->trace(m_document); 1972 visitor->trace(m_document);
1973 visitor->trace(m_tracker); 1973 visitor->trace(m_tracker);
1974 } 1974 }
1975 1975
1976 } // namespace blink 1976 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698