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

Side by Side Diff: Source/core/rendering/compositing/RenderLayerCompositor.cpp

Issue 648423002: Move painting code from FrameView to FramePainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed. Created 6 years, 2 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/paint/FramePainter.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 21 matching lines...) Expand all
32 #include "core/frame/FrameView.h" 32 #include "core/frame/FrameView.h"
33 #include "core/frame/LocalFrame.h" 33 #include "core/frame/LocalFrame.h"
34 #include "core/frame/Settings.h" 34 #include "core/frame/Settings.h"
35 #include "core/html/HTMLIFrameElement.h" 35 #include "core/html/HTMLIFrameElement.h"
36 #include "core/inspector/InspectorInstrumentation.h" 36 #include "core/inspector/InspectorInstrumentation.h"
37 #include "core/inspector/InspectorNodeIds.h" 37 #include "core/inspector/InspectorNodeIds.h"
38 #include "core/page/Chrome.h" 38 #include "core/page/Chrome.h"
39 #include "core/page/ChromeClient.h" 39 #include "core/page/ChromeClient.h"
40 #include "core/page/Page.h" 40 #include "core/page/Page.h"
41 #include "core/page/scrolling/ScrollingCoordinator.h" 41 #include "core/page/scrolling/ScrollingCoordinator.h"
42 #include "core/paint/FramePainter.h"
42 #include "core/rendering/RenderEmbeddedObject.h" 43 #include "core/rendering/RenderEmbeddedObject.h"
43 #include "core/rendering/RenderLayerStackingNode.h" 44 #include "core/rendering/RenderLayerStackingNode.h"
44 #include "core/rendering/RenderLayerStackingNodeIterator.h" 45 #include "core/rendering/RenderLayerStackingNodeIterator.h"
45 #include "core/rendering/RenderPart.h" 46 #include "core/rendering/RenderPart.h"
46 #include "core/rendering/RenderVideo.h" 47 #include "core/rendering/RenderVideo.h"
47 #include "core/rendering/RenderView.h" 48 #include "core/rendering/RenderView.h"
48 #include "core/rendering/compositing/CompositedLayerMapping.h" 49 #include "core/rendering/compositing/CompositedLayerMapping.h"
49 #include "core/rendering/compositing/CompositingInputsUpdater.h" 50 #include "core/rendering/compositing/CompositingInputsUpdater.h"
50 #include "core/rendering/compositing/CompositingLayerAssigner.h" 51 #include "core/rendering/compositing/CompositingLayerAssigner.h"
51 #include "core/rendering/compositing/CompositingRequirementsUpdater.h" 52 #include "core/rendering/compositing/CompositingRequirementsUpdater.h"
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 if (graphicsLayer == layerForHorizontalScrollbar()) 797 if (graphicsLayer == layerForHorizontalScrollbar())
797 paintScrollbar(m_renderView.frameView()->horizontalScrollbar(), context, clip); 798 paintScrollbar(m_renderView.frameView()->horizontalScrollbar(), context, clip);
798 else if (graphicsLayer == layerForVerticalScrollbar()) 799 else if (graphicsLayer == layerForVerticalScrollbar())
799 paintScrollbar(m_renderView.frameView()->verticalScrollbar(), context, c lip); 800 paintScrollbar(m_renderView.frameView()->verticalScrollbar(), context, c lip);
800 else if (graphicsLayer == layerForScrollCorner()) { 801 else if (graphicsLayer == layerForScrollCorner()) {
801 const IntRect& scrollCorner = m_renderView.frameView()->scrollCornerRect (); 802 const IntRect& scrollCorner = m_renderView.frameView()->scrollCornerRect ();
802 context.save(); 803 context.save();
803 context.translate(-scrollCorner.x(), -scrollCorner.y()); 804 context.translate(-scrollCorner.x(), -scrollCorner.y());
804 IntRect transformedClip = clip; 805 IntRect transformedClip = clip;
805 transformedClip.moveBy(scrollCorner.location()); 806 transformedClip.moveBy(scrollCorner.location());
806 m_renderView.frameView()->paintScrollCorner(&context, transformedClip); 807 FramePainter(*m_renderView.frameView()).paintScrollCorner(&context, tran sformedClip);
807 context.restore(); 808 context.restore();
808 } 809 }
809 } 810 }
810 811
811 bool RenderLayerCompositor::supportsFixedRootBackgroundCompositing() const 812 bool RenderLayerCompositor::supportsFixedRootBackgroundCompositing() const
812 { 813 {
813 if (Settings* settings = m_renderView.document().settings()) 814 if (Settings* settings = m_renderView.document().settings())
814 return settings->preferCompositingToLCDTextEnabled(); 815 return settings->preferCompositingToLCDTextEnabled();
815 return false; 816 return false;
816 } 817 }
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 } else if (graphicsLayer == m_scrollLayer.get()) { 1189 } else if (graphicsLayer == m_scrollLayer.get()) {
1189 name = "LocalFrame Scrolling Layer"; 1190 name = "LocalFrame Scrolling Layer";
1190 } else { 1191 } else {
1191 ASSERT_NOT_REACHED(); 1192 ASSERT_NOT_REACHED();
1192 } 1193 }
1193 1194
1194 return name; 1195 return name;
1195 } 1196 }
1196 1197
1197 } // namespace blink 1198 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/FramePainter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698