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

Unified 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: Merge with trunk (no changes from previous patch) 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/svg.css ('k') | Source/core/frame/UseCounter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index 78145ac6d95f2a6a16f6cc55d5909efa9debec72..5492208e6233fc2dcc3273dcf16398ee2f8d085d 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -1636,8 +1636,6 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
columnGap = overflowStyle->columnGap();
}
- WebScrollBlocksOn scrollBlocksOn = documentElementStyle->scrollBlocksOn();
-
RefPtr<ComputedStyle> documentStyle = layoutView()->mutableStyle();
if (documentStyle->writingMode() != rootWritingMode
|| documentStyle->direction() != rootDirection
@@ -1646,8 +1644,7 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
|| documentStyle->imageRendering() != imageRendering
|| documentStyle->overflowX() != overflowX
|| documentStyle->overflowY() != overflowY
- || documentStyle->columnGap() != columnGap
- || documentStyle->scrollBlocksOn() != scrollBlocksOn) {
+ || documentStyle->columnGap() != columnGap) {
RefPtr<ComputedStyle> newStyle = ComputedStyle::clone(*documentStyle);
newStyle->setWritingMode(rootWritingMode);
newStyle->setDirection(rootDirection);
@@ -1657,7 +1654,6 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
newStyle->setOverflowX(overflowX);
newStyle->setOverflowY(overflowY);
newStyle->setColumnGap(columnGap);
- newStyle->setScrollBlocksOn(scrollBlocksOn);
layoutView()->setStyle(newStyle);
setupFontBuilder(*newStyle);
}
« no previous file with comments | « Source/core/css/svg.css ('k') | Source/core/frame/UseCounter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698