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

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

Issue 178113003: Revert of Use SkLayerDrawLooper::Builder to construct SkLayerDrawLooper. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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
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" 30 #include "platform/graphics/DrawLooper.h"
31 #include "platform/graphics/GraphicsContextStateSaver.h" 31 #include "platform/graphics/GraphicsContextStateSaver.h"
32 #include "platform/text/TextRun.h" 32 #include "platform/text/TextRun.h"
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, La youtUnit lineTop, LayoutUnit lineBottom) 36 void EllipsisBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, La youtUnit lineTop, LayoutUnit lineBottom)
37 { 37 {
38 GraphicsContext* context = paintInfo.context; 38 GraphicsContext* context = paintInfo.context;
39 RenderStyle* style = m_renderer->style(isFirstLineStyle()); 39 RenderStyle* style = m_renderer->style(isFirstLineStyle());
40 40
(...skipping 19 matching lines...) Expand all
60 // Select the correct color for painting the text. 60 // Select the correct color for painting the text.
61 Color foreground = paintInfo.forceBlackText() ? Color::black : renderer( )->selectionForegroundColor(); 61 Color foreground = paintInfo.forceBlackText() ? Color::black : renderer( )->selectionForegroundColor();
62 if (foreground != styleTextColor) 62 if (foreground != styleTextColor)
63 context->setFillColor(foreground); 63 context->setFillColor(foreground);
64 } 64 }
65 65
66 // Text shadows are disabled when printing. http://crbug.com/258321 66 // Text shadows are disabled when printing. http://crbug.com/258321
67 const ShadowList* shadowList = context->printing() ? 0 : style->textShadow() ; 67 const ShadowList* shadowList = context->printing() ? 0 : style->textShadow() ;
68 bool hasShadow = shadowList; 68 bool hasShadow = shadowList;
69 if (hasShadow) { 69 if (hasShadow) {
70 OwnPtr<DrawLooperBuilder> drawLooperBuilder = DrawLooperBuilder::create( ); 70 DrawLooper drawLooper;
71 for (size_t i = shadowList->shadows().size(); i--; ) { 71 for (size_t i = shadowList->shadows().size(); i--; ) {
72 const ShadowData& shadow = shadowList->shadows()[i]; 72 const ShadowData& shadow = shadowList->shadows()[i];
73 float shadowX = isHorizontal() ? shadow.x() : shadow.y(); 73 float shadowX = isHorizontal() ? shadow.x() : shadow.y();
74 float shadowY = isHorizontal() ? shadow.y() : -shadow.x(); 74 float shadowY = isHorizontal() ? shadow.y() : -shadow.x();
75 FloatSize offset(shadowX, shadowY); 75 FloatSize offset(shadowX, shadowY);
76 drawLooperBuilder->addShadow(offset, shadow.blur(), shadow.color(), 76 drawLooper.addShadow(offset, shadow.blur(), shadow.color(),
77 DrawLooperBuilder::ShadowRespectsTransforms, DrawLooperBuilder:: ShadowIgnoresAlpha); 77 DrawLooper::ShadowRespectsTransforms, DrawLooper::ShadowIgnoresA lpha);
78 } 78 }
79 drawLooperBuilder->addUnmodifiedContent(); 79 drawLooper.addUnmodifiedContent();
80 context->setDrawLooper(drawLooperBuilder.release()); 80 context->setDrawLooper(drawLooper);
81 } 81 }
82 82
83 TextRun textRun = RenderBlockFlow::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion); 83 TextRun textRun = RenderBlockFlow::constructTextRun(renderer(), font, m_str, style, TextRun::AllowTrailingExpansion);
84 TextRunPaintInfo textRunPaintInfo(textRun); 84 TextRunPaintInfo textRunPaintInfo(textRun);
85 textRunPaintInfo.bounds = boxRect; 85 textRunPaintInfo.bounds = boxRect;
86 context->drawText(font, textRunPaintInfo, textOrigin); 86 context->drawText(font, textRunPaintInfo, textOrigin);
87 87
88 // Restore the regular fill color. 88 // Restore the regular fill color.
89 if (styleTextColor != context->fillColor()) 89 if (styleTextColor != context->fillColor())
90 context->setFillColor(styleTextColor); 90 context->setFillColor(styleTextColor);
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 if (visibleToHitTestRequest(request) && boundsRect.intersects(HitTestLocatio n::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) { 178 if (visibleToHitTestRequest(request) && boundsRect.intersects(HitTestLocatio n::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) {
179 renderer()->updateHitTestResult(result, locationInContainer.point() - to LayoutSize(adjustedLocation)); 179 renderer()->updateHitTestResult(result, locationInContainer.point() - to LayoutSize(adjustedLocation));
180 if (!result.addNodeToRectBasedTestResult(renderer()->node(), request, lo cationInContainer, boundsRect)) 180 if (!result.addNodeToRectBasedTestResult(renderer()->node(), request, lo cationInContainer, boundsRect))
181 return true; 181 return true;
182 } 182 }
183 183
184 return false; 184 return false;
185 } 185 }
186 186
187 } // namespace WebCore 187 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/canvas/CanvasRenderingContext2D.cpp ('k') | Source/core/rendering/InlineTextBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698