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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 564973002: Move a bunch more painting code out of RenderBoxModelObject and into BoxPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merged, made more things static. Created 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 18 matching lines...) Expand all
29 #include "core/dom/Document.h" 29 #include "core/dom/Document.h"
30 #include "core/dom/Element.h" 30 #include "core/dom/Element.h"
31 #include "core/dom/StyleEngine.h" 31 #include "core/dom/StyleEngine.h"
32 #include "core/dom/shadow/ShadowRoot.h" 32 #include "core/dom/shadow/ShadowRoot.h"
33 #include "core/editing/Editor.h" 33 #include "core/editing/Editor.h"
34 #include "core/editing/FrameSelection.h" 34 #include "core/editing/FrameSelection.h"
35 #include "core/events/OverflowEvent.h" 35 #include "core/events/OverflowEvent.h"
36 #include "core/fetch/ResourceLoadPriorityOptimizer.h" 36 #include "core/fetch/ResourceLoadPriorityOptimizer.h"
37 #include "core/frame/FrameView.h" 37 #include "core/frame/FrameView.h"
38 #include "core/frame/LocalFrame.h" 38 #include "core/frame/LocalFrame.h"
39 #include "core/frame/Settings.h"
39 #include "core/page/Page.h" 40 #include "core/page/Page.h"
40 #include "core/frame/Settings.h" 41 #include "core/paint/BoxPainter.h"
41 #include "core/rendering/GraphicsContextAnnotator.h" 42 #include "core/rendering/GraphicsContextAnnotator.h"
42 #include "core/rendering/HitTestLocation.h" 43 #include "core/rendering/HitTestLocation.h"
43 #include "core/rendering/HitTestResult.h" 44 #include "core/rendering/HitTestResult.h"
44 #include "core/rendering/InlineIterator.h" 45 #include "core/rendering/InlineIterator.h"
45 #include "core/rendering/InlineTextBox.h" 46 #include "core/rendering/InlineTextBox.h"
46 #include "core/rendering/PaintInfo.h" 47 #include "core/rendering/PaintInfo.h"
47 #include "core/rendering/RenderCombineText.h" 48 #include "core/rendering/RenderCombineText.h"
48 #include "core/rendering/RenderDeprecatedFlexibleBox.h" 49 #include "core/rendering/RenderDeprecatedFlexibleBox.h"
49 #include "core/rendering/RenderFlexibleBox.h" 50 #include "core/rendering/RenderFlexibleBox.h"
50 #include "core/rendering/RenderFlowThread.h" 51 #include "core/rendering/RenderFlowThread.h"
(...skipping 1758 matching lines...) Expand 10 before | Expand all | Expand 10 after
1809 EBorderStyle ruleStyle = style()->columnRuleStyle(); 1810 EBorderStyle ruleStyle = style()->columnRuleStyle();
1810 LayoutUnit ruleThickness = style()->columnRuleWidth(); 1811 LayoutUnit ruleThickness = style()->columnRuleWidth();
1811 LayoutUnit colGap = columnGap(); 1812 LayoutUnit colGap = columnGap();
1812 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent; 1813 bool renderRule = ruleStyle > BHIDDEN && !ruleTransparent;
1813 if (!renderRule) 1814 if (!renderRule)
1814 return; 1815 return;
1815 1816
1816 ColumnInfo* colInfo = columnInfo(); 1817 ColumnInfo* colInfo = columnInfo();
1817 unsigned colCount = columnCount(colInfo); 1818 unsigned colCount = columnCount(colInfo);
1818 1819
1819 bool antialias = shouldAntialiasLines(paintInfo.context); 1820 bool antialias = BoxPainter::shouldAntialiasLines(paintInfo.context);
1820 1821
1821 if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) { 1822 if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {
1822 bool leftToRight = style()->isLeftToRightDirection(); 1823 bool leftToRight = style()->isLeftToRightDirection();
1823 LayoutUnit currLogicalLeftOffset = leftToRight ? LayoutUnit() : contentL ogicalWidth(); 1824 LayoutUnit currLogicalLeftOffset = leftToRight ? LayoutUnit() : contentL ogicalWidth();
1824 LayoutUnit ruleAdd = logicalLeftOffsetForContent(); 1825 LayoutUnit ruleAdd = logicalLeftOffsetForContent();
1825 LayoutUnit ruleLogicalLeft = leftToRight ? LayoutUnit() : contentLogical Width(); 1826 LayoutUnit ruleLogicalLeft = leftToRight ? LayoutUnit() : contentLogical Width();
1826 LayoutUnit inlineDirectionSize = colInfo->desiredColumnWidth(); 1827 LayoutUnit inlineDirectionSize = colInfo->desiredColumnWidth();
1827 BoxSide boxSide = isHorizontalWritingMode() 1828 BoxSide boxSide = isHorizontalWritingMode()
1828 ? leftToRight ? BSLeft : BSRight 1829 ? leftToRight ? BSLeft : BSRight
1829 : leftToRight ? BSTop : BSBottom; 1830 : leftToRight ? BSTop : BSBottom;
(...skipping 2979 matching lines...) Expand 10 before | Expand all | Expand 10 after
4809 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4810 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4810 { 4811 {
4811 showRenderObject(); 4812 showRenderObject();
4812 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4813 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4813 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4814 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4814 } 4815 }
4815 4816
4816 #endif 4817 #endif
4817 4818
4818 } // namespace blink 4819 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698