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

Side by Side Diff: Source/core/rendering/RenderInline.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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 #include "core/rendering/RenderInline.h" 24 #include "core/rendering/RenderInline.h"
25 25
26 #include "core/dom/Fullscreen.h" 26 #include "core/dom/Fullscreen.h"
27 #include "core/dom/StyleEngine.h" 27 #include "core/dom/StyleEngine.h"
28 #include "core/page/Chrome.h" 28 #include "core/page/Chrome.h"
29 #include "core/page/Page.h" 29 #include "core/page/Page.h"
30 #include "core/paint/BoxPainter.h"
30 #include "core/rendering/GraphicsContextAnnotator.h" 31 #include "core/rendering/GraphicsContextAnnotator.h"
31 #include "core/rendering/HitTestResult.h" 32 #include "core/rendering/HitTestResult.h"
32 #include "core/rendering/InlineTextBox.h" 33 #include "core/rendering/InlineTextBox.h"
33 #include "core/rendering/RenderBlock.h" 34 #include "core/rendering/RenderBlock.h"
34 #include "core/rendering/RenderFlowThread.h" 35 #include "core/rendering/RenderFlowThread.h"
35 #include "core/rendering/RenderFullScreen.h" 36 #include "core/rendering/RenderFullScreen.h"
36 #include "core/rendering/RenderGeometryMap.h" 37 #include "core/rendering/RenderGeometryMap.h"
37 #include "core/rendering/RenderLayer.h" 38 #include "core/rendering/RenderLayer.h"
38 #include "core/rendering/RenderTheme.h" 39 #include "core/rendering/RenderTheme.h"
39 #include "core/rendering/RenderView.h" 40 #include "core/rendering/RenderView.h"
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1469 } 1470 }
1470 1471
1471 void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const L ayoutPoint& paintOffset, 1472 void RenderInline::paintOutlineForLine(GraphicsContext* graphicsContext, const L ayoutPoint& paintOffset,
1472 const LayoutRect& lastline, const LayoutR ect& thisline, const LayoutRect& nextline, 1473 const LayoutRect& lastline, const LayoutR ect& thisline, const LayoutRect& nextline,
1473 const Color outlineColor) 1474 const Color outlineColor)
1474 { 1475 {
1475 RenderStyle* styleToUse = style(); 1476 RenderStyle* styleToUse = style();
1476 int outlineWidth = styleToUse->outlineWidth(); 1477 int outlineWidth = styleToUse->outlineWidth();
1477 EBorderStyle outlineStyle = styleToUse->outlineStyle(); 1478 EBorderStyle outlineStyle = styleToUse->outlineStyle();
1478 1479
1479 bool antialias = shouldAntialiasLines(graphicsContext); 1480 bool antialias = BoxPainter::shouldAntialiasLines(graphicsContext);
1480 1481
1481 int offset = style()->outlineOffset(); 1482 int offset = style()->outlineOffset();
1482 1483
1483 LayoutRect box(LayoutPoint(paintOffset.x() + thisline.x() - offset, paintOff set.y() + thisline.y() - offset), 1484 LayoutRect box(LayoutPoint(paintOffset.x() + thisline.x() - offset, paintOff set.y() + thisline.y() - offset),
1484 LayoutSize(thisline.width() + offset, thisline.height() + offset)); 1485 LayoutSize(thisline.width() + offset, thisline.height() + offset));
1485 1486
1486 IntRect pixelSnappedBox = pixelSnappedIntRect(box); 1487 IntRect pixelSnappedBox = pixelSnappedIntRect(box);
1487 if (pixelSnappedBox.width() < 0 || pixelSnappedBox.height() < 0) 1488 if (pixelSnappedBox.width() < 0 || pixelSnappedBox.height() < 0)
1488 return; 1489 return;
1489 IntRect pixelSnappedLastLine = pixelSnappedIntRect(paintOffset.x() + lastlin e.x(), 0, lastline.width(), 0); 1490 IntRect pixelSnappedLastLine = pixelSnappedIntRect(paintOffset.x() + lastlin e.x(), 0, lastline.width(), 0);
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1597 container = this; 1598 container = this;
1598 1599
1599 FloatPoint absPos = container->localToAbsolute(); 1600 FloatPoint absPos = container->localToAbsolute();
1600 region.bounds.setX(absPos.x() + region.bounds.x()); 1601 region.bounds.setX(absPos.x() + region.bounds.x());
1601 region.bounds.setY(absPos.y() + region.bounds.y()); 1602 region.bounds.setY(absPos.y() + region.bounds.y());
1602 1603
1603 regions.append(region); 1604 regions.append(region);
1604 } 1605 }
1605 1606
1606 } // namespace blink 1607 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698