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

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

Issue 1287623002: Delete blink code for scroll-blocks-on (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | Annotate | Revision Log
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 r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after
1629 // Visible overflow on the viewport is meaningless, and the spec says to treat it as 'auto': 1629 // Visible overflow on the viewport is meaningless, and the spec says to treat it as 'auto':
1630 if (overflowX == OVISIBLE) 1630 if (overflowX == OVISIBLE)
1631 overflowX = OAUTO; 1631 overflowX = OAUTO;
1632 if (overflowY == OVISIBLE) 1632 if (overflowY == OVISIBLE)
1633 overflowY = OAUTO; 1633 overflowY = OAUTO;
1634 // Column-gap is (ab)used by the current paged overflow implementation ( in lack of other 1634 // Column-gap is (ab)used by the current paged overflow implementation ( in lack of other
1635 // ways to specify gaps between pages), so we have to propagate it too. 1635 // ways to specify gaps between pages), so we have to propagate it too.
1636 columnGap = overflowStyle->columnGap(); 1636 columnGap = overflowStyle->columnGap();
1637 } 1637 }
1638 1638
1639 WebScrollBlocksOn scrollBlocksOn = documentElementStyle->scrollBlocksOn();
1640
1641 RefPtr<ComputedStyle> documentStyle = layoutView()->mutableStyle(); 1639 RefPtr<ComputedStyle> documentStyle = layoutView()->mutableStyle();
1642 if (documentStyle->writingMode() != rootWritingMode 1640 if (documentStyle->writingMode() != rootWritingMode
1643 || documentStyle->direction() != rootDirection 1641 || documentStyle->direction() != rootDirection
1644 || documentStyle->visitedDependentColor(CSSPropertyBackgroundColor) != b ackgroundColor 1642 || documentStyle->visitedDependentColor(CSSPropertyBackgroundColor) != b ackgroundColor
1645 || documentStyle->backgroundLayers() != backgroundLayers 1643 || documentStyle->backgroundLayers() != backgroundLayers
1646 || documentStyle->imageRendering() != imageRendering 1644 || documentStyle->imageRendering() != imageRendering
1647 || documentStyle->overflowX() != overflowX 1645 || documentStyle->overflowX() != overflowX
1648 || documentStyle->overflowY() != overflowY 1646 || documentStyle->overflowY() != overflowY
1649 || documentStyle->columnGap() != columnGap 1647 || documentStyle->columnGap() != columnGap) {
1650 || documentStyle->scrollBlocksOn() != scrollBlocksOn) {
1651 RefPtr<ComputedStyle> newStyle = ComputedStyle::clone(*documentStyle); 1648 RefPtr<ComputedStyle> newStyle = ComputedStyle::clone(*documentStyle);
1652 newStyle->setWritingMode(rootWritingMode); 1649 newStyle->setWritingMode(rootWritingMode);
1653 newStyle->setDirection(rootDirection); 1650 newStyle->setDirection(rootDirection);
1654 newStyle->setBackgroundColor(backgroundColor); 1651 newStyle->setBackgroundColor(backgroundColor);
1655 newStyle->accessBackgroundLayers() = backgroundLayers; 1652 newStyle->accessBackgroundLayers() = backgroundLayers;
1656 newStyle->setImageRendering(imageRendering); 1653 newStyle->setImageRendering(imageRendering);
1657 newStyle->setOverflowX(overflowX); 1654 newStyle->setOverflowX(overflowX);
1658 newStyle->setOverflowY(overflowY); 1655 newStyle->setOverflowY(overflowY);
1659 newStyle->setColumnGap(columnGap); 1656 newStyle->setColumnGap(columnGap);
1660 newStyle->setScrollBlocksOn(scrollBlocksOn);
1661 layoutView()->setStyle(newStyle); 1657 layoutView()->setStyle(newStyle);
1662 setupFontBuilder(*newStyle); 1658 setupFontBuilder(*newStyle);
1663 } 1659 }
1664 1660
1665 if (body) { 1661 if (body) {
1666 if (const ComputedStyle* style = body->computedStyle()) { 1662 if (const ComputedStyle* style = body->computedStyle()) {
1667 if (style->direction() != rootDirection || style->writingMode() != r ootWritingMode) 1663 if (style->direction() != rootDirection || style->writingMode() != r ootWritingMode)
1668 body->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonF orTracing::create(StyleChangeReason::WritingModeChange)); 1664 body->setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonF orTracing::create(StyleChangeReason::WritingModeChange));
1669 } 1665 }
1670 } 1666 }
(...skipping 4109 matching lines...) Expand 10 before | Expand all | Expand 10 after
5780 #ifndef NDEBUG 5776 #ifndef NDEBUG
5781 using namespace blink; 5777 using namespace blink;
5782 void showLiveDocumentInstances() 5778 void showLiveDocumentInstances()
5783 { 5779 {
5784 WeakDocumentSet& set = liveDocumentSet(); 5780 WeakDocumentSet& set = liveDocumentSet();
5785 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 5781 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
5786 for (Document* document : set) 5782 for (Document* document : set)
5787 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data()); 5783 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str ing().utf8().data());
5788 } 5784 }
5789 #endif 5785 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698