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

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

Issue 2660423004: Rename EOverflow values with k prefix. (Closed)
Patch Set: Rebase Created 3 years, 10 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 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 : READ_ONLY); 560 : READ_ONLY);
561 // These are designed to match the user-agent stylesheet values for the 561 // These are designed to match the user-agent stylesheet values for the
562 // document element so that the common case doesn't need to create a new 562 // document element so that the common case doesn't need to create a new
563 // ComputedStyle in Document::inheritHtmlAndBodyElementStyles. 563 // ComputedStyle in Document::inheritHtmlAndBodyElementStyles.
564 documentStyle->setDisplay(EDisplay::Block); 564 documentStyle->setDisplay(EDisplay::Block);
565 documentStyle->setPosition(AbsolutePosition); 565 documentStyle->setPosition(AbsolutePosition);
566 566
567 // Document::inheritHtmlAndBodyElementStyles will set the final overflow 567 // Document::inheritHtmlAndBodyElementStyles will set the final overflow
568 // style values, but they should initially be auto to avoid premature 568 // style values, but they should initially be auto to avoid premature
569 // scrollbar removal in PaintLayerScrollableArea::updateAfterStyleChange. 569 // scrollbar removal in PaintLayerScrollableArea::updateAfterStyleChange.
570 documentStyle->setOverflowX(EOverflow::Auto); 570 documentStyle->setOverflowX(EOverflow::kAuto);
571 documentStyle->setOverflowY(EOverflow::Auto); 571 documentStyle->setOverflowY(EOverflow::kAuto);
572 572
573 document.setupFontBuilder(*documentStyle); 573 document.setupFontBuilder(*documentStyle);
574 574
575 return documentStyle.release(); 575 return documentStyle.release();
576 } 576 }
577 577
578 void StyleResolver::adjustComputedStyle(StyleResolverState& state, 578 void StyleResolver::adjustComputedStyle(StyleResolverState& state,
579 Element* element) { 579 Element* element) {
580 StyleAdjuster::adjustComputedStyle(state.mutableStyleRef(), 580 StyleAdjuster::adjustComputedStyle(state.mutableStyleRef(),
581 *state.parentStyle(), element); 581 *state.parentStyle(), element);
(...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 1933
1934 DEFINE_TRACE(StyleResolver) { 1934 DEFINE_TRACE(StyleResolver) {
1935 visitor->trace(m_matchedPropertiesCache); 1935 visitor->trace(m_matchedPropertiesCache);
1936 visitor->trace(m_selectorFilter); 1936 visitor->trace(m_selectorFilter);
1937 visitor->trace(m_styleSharingLists); 1937 visitor->trace(m_styleSharingLists);
1938 visitor->trace(m_document); 1938 visitor->trace(m_document);
1939 visitor->trace(m_tracker); 1939 visitor->trace(m_tracker);
1940 } 1940 }
1941 1941
1942 } // namespace blink 1942 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.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