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

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

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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 * 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 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 collector.addElementStyleProperties( 473 collector.addElementStyleProperties(
474 state.element()->additionalPresentationAttributeStyle()); 474 state.element()->additionalPresentationAttributeStyle());
475 475
476 if (state.element()->isHTMLElement()) { 476 if (state.element()->isHTMLElement()) {
477 bool isAuto; 477 bool isAuto;
478 TextDirection textDirection = 478 TextDirection textDirection =
479 toHTMLElement(state.element()) 479 toHTMLElement(state.element())
480 ->directionalityIfhasDirAutoAttribute(isAuto); 480 ->directionalityIfhasDirAutoAttribute(isAuto);
481 if (isAuto) { 481 if (isAuto) {
482 state.setHasDirAutoAttribute(true); 482 state.setHasDirAutoAttribute(true);
483 collector.addElementStyleProperties(textDirection == TextDirection::Ltr 483 collector.addElementStyleProperties(textDirection == TextDirection::kLtr
484 ? leftToRightDeclaration() 484 ? leftToRightDeclaration()
485 : rightToLeftDeclaration()); 485 : rightToLeftDeclaration());
486 } 486 }
487 } 487 }
488 } 488 }
489 489
490 matchAuthorRules(*state.element(), collector); 490 matchAuthorRules(*state.element(), collector);
491 491
492 if (state.element()->isStyledElement()) { 492 if (state.element()->isStyledElement()) {
493 // For Shadow DOM V1, inline style is already collected in 493 // For Shadow DOM V1, inline style is already collected in
(...skipping 1441 matching lines...) Expand 10 before | Expand all | Expand 10 after
1935 1935
1936 DEFINE_TRACE(StyleResolver) { 1936 DEFINE_TRACE(StyleResolver) {
1937 visitor->trace(m_matchedPropertiesCache); 1937 visitor->trace(m_matchedPropertiesCache);
1938 visitor->trace(m_selectorFilter); 1938 visitor->trace(m_selectorFilter);
1939 visitor->trace(m_styleSharingLists); 1939 visitor->trace(m_styleSharingLists);
1940 visitor->trace(m_document); 1940 visitor->trace(m_document);
1941 visitor->trace(m_tracker); 1941 visitor->trace(m_tracker);
1942 } 1942 }
1943 1943
1944 } // namespace blink 1944 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698