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

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 2569013006: Changed EOverflow to an enum class and renamed its members (Closed)
Patch Set: Rebase 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) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
7 * rights reserved. 7 * rights reserved.
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 10 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
(...skipping 1788 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 !documentElement()->computedStyle() || 1799 !documentElement()->computedStyle() ||
1800 documentElement()->computedStyle()->fontSize() != 1800 documentElement()->computedStyle()->fontSize() !=
1801 documentElementStyle->fontSize())) { 1801 documentElementStyle->fontSize())) {
1802 ensureStyleResolver().invalidateMatchedPropertiesCache(); 1802 ensureStyleResolver().invalidateMatchedPropertiesCache();
1803 documentElement()->setNeedsStyleRecalc( 1803 documentElement()->setNeedsStyleRecalc(
1804 SubtreeStyleChange, 1804 SubtreeStyleChange,
1805 StyleChangeReasonForTracing::create(StyleChangeReason::FontSizeChange)); 1805 StyleChangeReasonForTracing::create(StyleChangeReason::FontSizeChange));
1806 } 1806 }
1807 1807
1808 EOverflowAnchor overflowAnchor = EOverflowAnchor::Auto; 1808 EOverflowAnchor overflowAnchor = EOverflowAnchor::Auto;
1809 EOverflow overflowX = OverflowAuto; 1809 EOverflow overflowX = EOverflow::Auto;
1810 EOverflow overflowY = OverflowAuto; 1810 EOverflow overflowY = EOverflow::Auto;
1811 float columnGap = 0; 1811 float columnGap = 0;
1812 if (overflowStyle) { 1812 if (overflowStyle) {
1813 overflowAnchor = overflowStyle->overflowAnchor(); 1813 overflowAnchor = overflowStyle->overflowAnchor();
1814 overflowX = overflowStyle->overflowX(); 1814 overflowX = overflowStyle->overflowX();
1815 overflowY = overflowStyle->overflowY(); 1815 overflowY = overflowStyle->overflowY();
1816 // Visible overflow on the viewport is meaningless, and the spec says to 1816 // Visible overflow on the viewport is meaningless, and the spec says to
1817 // treat it as 'auto': 1817 // treat it as 'auto':
1818 if (overflowX == OverflowVisible) 1818 if (overflowX == EOverflow::Visible)
1819 overflowX = OverflowAuto; 1819 overflowX = EOverflow::Auto;
1820 if (overflowY == OverflowVisible) 1820 if (overflowY == EOverflow::Visible)
1821 overflowY = OverflowAuto; 1821 overflowY = EOverflow::Auto;
1822 if (overflowAnchor == EOverflowAnchor::Visible) 1822 if (overflowAnchor == EOverflowAnchor::Visible)
1823 overflowAnchor = EOverflowAnchor::Auto; 1823 overflowAnchor = EOverflowAnchor::Auto;
1824 // Column-gap is (ab)used by the current paged overflow implementation (in 1824 // Column-gap is (ab)used by the current paged overflow implementation (in
1825 // lack of other ways to specify gaps between pages), so we have to 1825 // lack of other ways to specify gaps between pages), so we have to
1826 // propagate it too. 1826 // propagate it too.
1827 columnGap = overflowStyle->columnGap(); 1827 columnGap = overflowStyle->columnGap();
1828 } 1828 }
1829 1829
1830 ScrollSnapType snapType = overflowStyle->getScrollSnapType(); 1830 ScrollSnapType snapType = overflowStyle->getScrollSnapType();
1831 const LengthPoint& snapDestination = overflowStyle->scrollSnapDestination(); 1831 const LengthPoint& snapDestination = overflowStyle->scrollSnapDestination();
(...skipping 4740 matching lines...) Expand 10 before | Expand all | Expand 10 after
6572 } 6572 }
6573 6573
6574 void showLiveDocumentInstances() { 6574 void showLiveDocumentInstances() {
6575 WeakDocumentSet& set = liveDocumentSet(); 6575 WeakDocumentSet& set = liveDocumentSet();
6576 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6576 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6577 for (Document* document : set) 6577 for (Document* document : set)
6578 fprintf(stderr, "- Document %p URL: %s\n", document, 6578 fprintf(stderr, "- Document %p URL: %s\n", document,
6579 document->url().getString().utf8().data()); 6579 document->url().getString().utf8().data());
6580 } 6580 }
6581 #endif 6581 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698