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

Side by Side Diff: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

Issue 1309243006: Remove old repaint rect tracking from FrameView. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 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 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 if (!m_rootContentLayer) 613 if (!m_rootContentLayer)
614 return String(); 614 return String();
615 615
616 // We skip dumping the scroll and clip layers to keep layerTreeAsText output 616 // We skip dumping the scroll and clip layers to keep layerTreeAsText output
617 // similar between platforms (unless we explicitly request dumping from the 617 // similar between platforms (unless we explicitly request dumping from the
618 // root. 618 // root.
619 GraphicsLayer* rootLayer = m_rootContentLayer.get(); 619 GraphicsLayer* rootLayer = m_rootContentLayer.get();
620 if (flags & LayerTreeIncludesRootLayer) 620 if (flags & LayerTreeIncludesRootLayer)
621 rootLayer = rootGraphicsLayer(); 621 rootLayer = rootGraphicsLayer();
622 622
623 String layerTreeText = rootLayer->layerTreeAsText(flags); 623 return rootLayer->layerTreeAsText(flags);
624
625 // The true root layer is not included in the dump, so if we want to report
626 // its paint invalidation rects, they must be included here.
627 if (flags & LayerTreeIncludesPaintInvalidationRects)
628 return m_layoutView.frameView()->trackedPaintInvalidationRectsAsText() + layerTreeText;
629
630 return layerTreeText;
631 } 624 }
632 625
633 DeprecatedPaintLayerCompositor* DeprecatedPaintLayerCompositor::frameContentsCom positor(LayoutPart* layoutObject) 626 DeprecatedPaintLayerCompositor* DeprecatedPaintLayerCompositor::frameContentsCom positor(LayoutPart* layoutObject)
634 { 627 {
635 if (!layoutObject->node()->isFrameOwnerElement()) 628 if (!layoutObject->node()->isFrameOwnerElement())
636 return nullptr; 629 return nullptr;
637 630
638 HTMLFrameOwnerElement* element = toHTMLFrameOwnerElement(layoutObject->node( )); 631 HTMLFrameOwnerElement* element = toHTMLFrameOwnerElement(layoutObject->node( ));
639 if (Document* contentDocument = element->contentDocument()) { 632 if (Document* contentDocument = element->contentDocument()) {
640 if (LayoutView* view = contentDocument->layoutView()) 633 if (LayoutView* view = contentDocument->layoutView())
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 } else if (graphicsLayer == m_scrollLayer.get()) { 1201 } else if (graphicsLayer == m_scrollLayer.get()) {
1209 name = "LocalFrame Scrolling Layer"; 1202 name = "LocalFrame Scrolling Layer";
1210 } else { 1203 } else {
1211 ASSERT_NOT_REACHED(); 1204 ASSERT_NOT_REACHED();
1212 } 1205 }
1213 1206
1214 return name; 1207 return name;
1215 } 1208 }
1216 1209
1217 } // namespace blink 1210 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698