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

Unified Diff: Source/core/dom/Document.cpp

Issue 784453003: Initial scroll-blocks-on compositor integration (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Eliminate scrollbars from iframe test for cross-platform output consistency Created 5 years, 11 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
Index: Source/core/dom/Document.cpp
diff --git a/Source/core/dom/Document.cpp b/Source/core/dom/Document.cpp
index 507d627f874bfd3470db64f9c514df53beb3012b..ed32db5dc9abfa7076b897f964dcde6993aa9b58 100644
--- a/Source/core/dom/Document.cpp
+++ b/Source/core/dom/Document.cpp
@@ -1689,18 +1689,22 @@ void Document::inheritHtmlAndBodyElementStyles(StyleRecalcChange change)
columnGap = overflowStyle->columnGap();
}
+ WebScrollBlocksOn scrollBlocksOn = documentElementStyle->scrollBlocksOn();
+
RefPtr<RenderStyle> documentStyle = renderView()->style();
if (documentStyle->writingMode() != rootWritingMode
|| documentStyle->direction() != rootDirection
|| documentStyle->overflowX() != overflowX
|| documentStyle->overflowY() != overflowY
- || documentStyle->columnGap() != columnGap) {
+ || documentStyle->columnGap() != columnGap
+ || documentStyle->scrollBlocksOn() != scrollBlocksOn) {
RefPtr<RenderStyle> newStyle = RenderStyle::clone(documentStyle.get());
newStyle->setWritingMode(rootWritingMode);
newStyle->setDirection(rootDirection);
newStyle->setColumnGap(columnGap);
newStyle->setOverflowX(overflowX);
newStyle->setOverflowY(overflowY);
+ newStyle->setScrollBlocksOn(scrollBlocksOn);
renderView()->setStyle(newStyle);
setupFontBuilder(newStyle.get());
}

Powered by Google App Engine
This is Rietveld 408576698