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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTreeAsText.cpp

Issue 2258523006: Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add RAII-style helper to toggle REF. Rebase. Created 4 years, 3 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) 2004, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 static void write(TextStream& ts, PaintLayer& layer, 558 static void write(TextStream& ts, PaintLayer& layer,
559 const LayoutRect& layerBounds, const LayoutRect& backgroundClipRect, const L ayoutRect& clipRect, 559 const LayoutRect& layerBounds, const LayoutRect& backgroundClipRect, const L ayoutRect& clipRect,
560 LayerPaintPhase paintPhase = LayerPaintPhaseAll, int indent = 0, LayoutAsTex tBehavior behavior = LayoutAsTextBehaviorNormal, 560 LayerPaintPhase paintPhase = LayerPaintPhaseAll, int indent = 0, LayoutAsTex tBehavior behavior = LayoutAsTextBehaviorNormal,
561 const PaintLayer* markedLayer = nullptr) 561 const PaintLayer* markedLayer = nullptr)
562 { 562 {
563 IntRect adjustedLayoutBounds = pixelSnappedIntRect(layerBounds); 563 IntRect adjustedLayoutBounds = pixelSnappedIntRect(layerBounds);
564 IntRect adjustedLayoutBoundsWithScrollbars = adjustedLayoutBounds; 564 IntRect adjustedLayoutBoundsWithScrollbars = adjustedLayoutBounds;
565 IntRect adjustedBackgroundClipRect = pixelSnappedIntRect(backgroundClipRect) ; 565 IntRect adjustedBackgroundClipRect = pixelSnappedIntRect(backgroundClipRect) ;
566 IntRect adjustedClipRect = pixelSnappedIntRect(clipRect); 566 IntRect adjustedClipRect = pixelSnappedIntRect(clipRect);
567 567
568 Settings* settings = layer.layoutObject()->document().settings(); 568 bool reportFrameScrollInfo = layer.layoutObject()->isLayoutView() && !Runtim eEnabledFeatures::rootLayerScrollingEnabled();
569 bool reportFrameScrollInfo = layer.layoutObject()->isLayoutView() && setting s && !settings->rootLayerScrolls();
570 569
571 if (reportFrameScrollInfo) { 570 if (reportFrameScrollInfo) {
572 LayoutView* layoutView = toLayoutView(layer.layoutObject()); 571 LayoutView* layoutView = toLayoutView(layer.layoutObject());
573 572
574 adjustedLayoutBoundsWithScrollbars.setWidth(layoutView->viewWidth(Includ eScrollbars)); 573 adjustedLayoutBoundsWithScrollbars.setWidth(layoutView->viewWidth(Includ eScrollbars));
575 adjustedLayoutBoundsWithScrollbars.setHeight(layoutView->viewHeight(Incl udeScrollbars)); 574 adjustedLayoutBoundsWithScrollbars.setHeight(layoutView->viewHeight(Incl udeScrollbars));
576 } 575 }
577 576
578 if (markedLayer) 577 if (markedLayer)
579 ts << (markedLayer == &layer ? "*" : " "); 578 ts << (markedLayer == &layer ? "*" : " ");
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 element->document().updateStyleAndLayout(); 844 element->document().updateStyleAndLayout();
846 845
847 LayoutObject* layoutObject = element->layoutObject(); 846 LayoutObject* layoutObject = element->layoutObject();
848 if (!layoutObject || !layoutObject->isListItem()) 847 if (!layoutObject || !layoutObject->isListItem())
849 return String(); 848 return String();
850 849
851 return toLayoutListItem(layoutObject)->markerText(); 850 return toLayoutListItem(layoutObject)->markerText();
852 } 851 }
853 852
854 } // namespace blink 853 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Settings.in ('k') | third_party/WebKit/Source/core/layout/LayoutView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698