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

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

Issue 356123002: Consolidate some text shadow code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rendererToUse -> renderer() Created 6 years, 5 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 | « no previous file | Source/core/rendering/InlineTextBox.cpp » ('j') | 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) 2003, 2006 Apple Computer, Inc. 2 * Copyright (C) 2003, 2006 Apple Computer, Inc.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #include "config.h" 20 #include "config.h"
21 #include "core/rendering/EllipsisBox.h" 21 #include "core/rendering/EllipsisBox.h"
22 22
23 #include "core/rendering/HitTestResult.h" 23 #include "core/rendering/HitTestResult.h"
24 #include "core/rendering/InlineTextBox.h" 24 #include "core/rendering/InlineTextBox.h"
25 #include "core/rendering/PaintInfo.h" 25 #include "core/rendering/PaintInfo.h"
26 #include "core/rendering/RenderBlockFlow.h" 26 #include "core/rendering/RenderBlockFlow.h"
27 #include "core/rendering/RootInlineBox.h" 27 #include "core/rendering/RootInlineBox.h"
28 #include "core/rendering/style/ShadowList.h" 28 #include "core/rendering/style/ShadowList.h"
29 #include "platform/fonts/Font.h" 29 #include "platform/fonts/Font.h"
30 #include "platform/graphics/DrawLooperBuilder.h"
31 #include "platform/graphics/GraphicsContextStateSaver.h" 30 #include "platform/graphics/GraphicsContextStateSaver.h"
32 #include "platform/text/TextRun.h" 31 #include "platform/text/TextRun.h"
33 32
34 namespace WebCore { 33 namespace WebCore {
35 34
36 void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, La youtUnit lineTop, LayoutUnit lineBottom) 35 void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, La youtUnit lineTop, LayoutUnit lineBottom)
37 { 36 {
38 GraphicsContext* context = paintInfo.context; 37 GraphicsContext* context = paintInfo.context;
39 RenderStyle* style = renderer().style(isFirstLineStyle()); 38 RenderStyle* style = renderer().style(isFirstLineStyle());
40 39
(...skipping 17 matching lines...) Expand all
58 57
59 // Select the correct color for painting the text. 58 // Select the correct color for painting the text.
60 Color foreground = paintInfo.forceBlackText() ? Color::black : renderer( ).selectionForegroundColor(); 59 Color foreground = paintInfo.forceBlackText() ? Color::black : renderer( ).selectionForegroundColor();
61 if (foreground != styleTextColor) 60 if (foreground != styleTextColor)
62 context->setFillColor(foreground); 61 context->setFillColor(foreground);
63 } 62 }
64 63
65 // Text shadows are disabled when printing. http://crbug.com/258321 64 // Text shadows are disabled when printing. http://crbug.com/258321
66 const ShadowList* shadowList = context->printing() ? 0 : style->textShadow() ; 65 const ShadowList* shadowList = context->printing() ? 0 : style->textShadow() ;
67 bool hasShadow = shadowList; 66 bool hasShadow = shadowList;
68 if (hasShadow) { 67 if (hasShadow)
69 OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create( ); 68 context->setDrawLooper(shadowList->createDrawLooper(DrawLooperBuilder::S hadowIgnoresAlpha, isHorizontal()));
70 for (size_t i = shadowList->shadows().size(); i--; ) {
71 const ShadowData& shadow = shadowList->shadows()[i];
72 float shadowX = isHorizontal() ? shadow.x() : shadow.y();
73 float shadowY = isHorizontal() ? shadow.y() : -shadow.x();
74 FloatSize offset(shadowX, shadowY);
75 drawLooperBuilder->addShadow(offset, shadow.blur(), shadow.color(),
76 DrawLooperBuilder::ShadowRespectsTransforms, DrawLooperBuilder:: ShadowIgnoresAlpha);
77 }
78 drawLooperBuilder->addUnmodifiedContent();
79 context->setDrawLooper(drawLooperBuilder.release());
80 }
81 69
82 TextRun textRun = RenderBlockFlow::constructTextRun(&renderer(), font, m_str , style, TextRun::AllowTrailingExpansion); 70 TextRun textRun = RenderBlockFlow::constructTextRun(&renderer(), font, m_str , style, TextRun::AllowTrailingExpansion);
83 TextRunPaintInfo textRunPaintInfo(textRun); 71 TextRunPaintInfo textRunPaintInfo(textRun);
84 textRunPaintInfo.bounds = boxRect; 72 textRunPaintInfo.bounds = boxRect;
85 context->drawText(font, textRunPaintInfo, textOrigin); 73 context->drawText(font, textRunPaintInfo, textOrigin);
86 74
87 // Restore the regular fill color. 75 // Restore the regular fill color.
88 if (styleTextColor != context->fillColor()) 76 if (styleTextColor != context->fillColor())
89 context->setFillColor(styleTextColor); 77 context->setFillColor(styleTextColor);
90 78
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 if (visibleToHitTestRequest(request) && boundsRect.intersects(HitTestLocatio n::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) { 165 if (visibleToHitTestRequest(request) && boundsRect.intersects(HitTestLocatio n::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) {
178 renderer().updateHitTestResult(result, locationInContainer.point() - toL ayoutSize(adjustedLocation)); 166 renderer().updateHitTestResult(result, locationInContainer.point() - toL ayoutSize(adjustedLocation));
179 if (!result.addNodeToRectBasedTestResult(renderer().node(), request, loc ationInContainer, boundsRect)) 167 if (!result.addNodeToRectBasedTestResult(renderer().node(), request, loc ationInContainer, boundsRect))
180 return true; 168 return true;
181 } 169 }
182 170
183 return false; 171 return false;
184 } 172 }
185 173
186 } // namespace WebCore 174 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/InlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698