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

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

Issue 2546333002: Changed Order to an enum class and renamed its members (Closed)
Patch Set: 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 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 596
597 ++innerCascadeOrder; 597 ++innerCascadeOrder;
598 --outerCascadeOrder; 598 --outerCascadeOrder;
599 } 599 }
600 } 600 }
601 601
602 PassRefPtr<ComputedStyle> StyleResolver::styleForDocument(Document& document) { 602 PassRefPtr<ComputedStyle> StyleResolver::styleForDocument(Document& document) {
603 const LocalFrame* frame = document.frame(); 603 const LocalFrame* frame = document.frame();
604 604
605 RefPtr<ComputedStyle> documentStyle = ComputedStyle::create(); 605 RefPtr<ComputedStyle> documentStyle = ComputedStyle::create();
606 documentStyle->setRTLOrdering(document.visuallyOrdered() ? VisualOrder 606 documentStyle->setRTLOrdering(document.visuallyOrdered() ? EOrder::Visual
607 : LogicalOrder); 607 : EOrder::Logical);
608 documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor() 608 documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor()
609 : 1); 609 : 1);
610 FontDescription documentFontDescription = documentStyle->getFontDescription(); 610 FontDescription documentFontDescription = documentStyle->getFontDescription();
611 documentFontDescription.setLocale( 611 documentFontDescription.setLocale(
612 LayoutLocale::get(document.contentLanguage())); 612 LayoutLocale::get(document.contentLanguage()));
613 documentStyle->setFontDescription(documentFontDescription); 613 documentStyle->setFontDescription(documentFontDescription);
614 documentStyle->setZIndex(0); 614 documentStyle->setZIndex(0);
615 documentStyle->setIsStackingContext(true); 615 documentStyle->setIsStackingContext(true);
616 documentStyle->setUserModify(document.inDesignMode() ? READ_WRITE 616 documentStyle->setUserModify(document.inDesignMode() ? READ_WRITE
617 : READ_ONLY); 617 : READ_ONLY);
(...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after
1845 DEFINE_TRACE(StyleResolver) { 1845 DEFINE_TRACE(StyleResolver) {
1846 visitor->trace(m_matchedPropertiesCache); 1846 visitor->trace(m_matchedPropertiesCache);
1847 visitor->trace(m_selectorFilter); 1847 visitor->trace(m_selectorFilter);
1848 visitor->trace(m_styleSharingLists); 1848 visitor->trace(m_styleSharingLists);
1849 visitor->trace(m_pendingStyleSheets); 1849 visitor->trace(m_pendingStyleSheets);
1850 visitor->trace(m_document); 1850 visitor->trace(m_document);
1851 visitor->trace(m_tracker); 1851 visitor->trace(m_tracker);
1852 } 1852 }
1853 1853
1854 } // namespace blink 1854 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698