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

Side by Side Diff: Source/core/paint/FrameSetPainter.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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') | Source/core/paint/GraphicsContextAnnotator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/paint/FrameSetPainter.h" 6 #include "core/paint/FrameSetPainter.h"
7 7
8 #include "core/html/HTMLFrameSetElement.h" 8 #include "core/html/HTMLFrameSetElement.h"
9 #include "core/paint/GraphicsContextAnnotator.h" 9 #include "core/paint/GraphicsContextAnnotator.h"
10 #include "core/rendering/PaintInfo.h" 10 #include "core/rendering/PaintInfo.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 65 }
66 } 66 }
67 67
68 void FrameSetPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paint Offset) 68 void FrameSetPainter::paint(const PaintInfo& paintInfo, const LayoutPoint& paint Offset)
69 { 69 {
70 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, &m_renderFrameSet); 70 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, &m_renderFrameSet);
71 71
72 if (paintInfo.phase != PaintPhaseForeground) 72 if (paintInfo.phase != PaintPhaseForeground)
73 return; 73 return;
74 74
75 RenderObject* child = m_renderFrameSet.firstChild(); 75 LayoutObject* child = m_renderFrameSet.firstChild();
76 if (!child) 76 if (!child)
77 return; 77 return;
78 78
79 LayoutPoint adjustedPaintOffset = paintOffset + m_renderFrameSet.location(); 79 LayoutPoint adjustedPaintOffset = paintOffset + m_renderFrameSet.location();
80 80
81 size_t rows = m_renderFrameSet.rows().m_sizes.size(); 81 size_t rows = m_renderFrameSet.rows().m_sizes.size();
82 size_t cols = m_renderFrameSet.columns().m_sizes.size(); 82 size_t cols = m_renderFrameSet.columns().m_sizes.size();
83 LayoutUnit borderThickness = m_renderFrameSet.frameSet()->border(); 83 LayoutUnit borderThickness = m_renderFrameSet.frameSet()->border();
84 84
85 LayoutUnit yPos = 0; 85 LayoutUnit yPos = 0;
(...skipping 14 matching lines...) Expand all
100 yPos += m_renderFrameSet.rows().m_sizes[r]; 100 yPos += m_renderFrameSet.rows().m_sizes[r];
101 if (borderThickness && m_renderFrameSet.rows().m_allowBorder[r + 1]) { 101 if (borderThickness && m_renderFrameSet.rows().m_allowBorder[r + 1]) {
102 paintRowBorder(paintInfo, pixelSnappedIntRect( 102 paintRowBorder(paintInfo, pixelSnappedIntRect(
103 LayoutRect(adjustedPaintOffset.x(), adjustedPaintOffset.y() + yP os, m_renderFrameSet.size().width(), borderThickness))); 103 LayoutRect(adjustedPaintOffset.x(), adjustedPaintOffset.y() + yP os, m_renderFrameSet.size().width(), borderThickness)));
104 yPos += borderThickness; 104 yPos += borderThickness;
105 } 105 }
106 } 106 }
107 } 107 }
108 108
109 } // namespace blink 109 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/FramePainter.cpp ('k') | Source/core/paint/GraphicsContextAnnotator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698