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

Side by Side Diff: Source/core/rendering/svg/SVGInlineTextBox.cpp

Issue 625933003: Consolidated checks for the PaintBehaviorRenderingSVGMask flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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) 2007 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007 Rob Buis <buis@kde.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. 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 #include "config.h" 22 #include "config.h"
23 #include "core/rendering/svg/SVGInlineTextBox.h" 23 #include "core/rendering/svg/SVGInlineTextBox.h"
24 24
25 #include "core/dom/DocumentMarkerController.h" 25 #include "core/dom/DocumentMarkerController.h"
26 #include "core/dom/RenderedDocumentMarker.h" 26 #include "core/dom/RenderedDocumentMarker.h"
27 #include "core/editing/Editor.h" 27 #include "core/editing/Editor.h"
28 #include "core/frame/FrameView.h"
29 #include "core/frame/LocalFrame.h" 28 #include "core/frame/LocalFrame.h"
30 #include "core/paint/InlinePainter.h" 29 #include "core/paint/InlinePainter.h"
31 #include "core/rendering/HitTestResult.h" 30 #include "core/rendering/HitTestResult.h"
32 #include "core/rendering/InlineFlowBox.h" 31 #include "core/rendering/InlineFlowBox.h"
33 #include "core/rendering/PaintInfo.h" 32 #include "core/rendering/PaintInfo.h"
34 #include "core/rendering/PointerEventsHitRules.h" 33 #include "core/rendering/PointerEventsHitRules.h"
35 #include "core/rendering/RenderInline.h" 34 #include "core/rendering/RenderInline.h"
36 #include "core/rendering/RenderTheme.h" 35 #include "core/rendering/RenderTheme.h"
37 #include "core/rendering/style/ShadowList.h" 36 #include "core/rendering/style/ShadowList.h"
38 #include "core/rendering/svg/RenderSVGInlineText.h" 37 #include "core/rendering/svg/RenderSVGInlineText.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 277
279 if (!hasFill) 278 if (!hasFill)
280 hasFill = svgSelectionStyle.hasFill(); 279 hasFill = svgSelectionStyle.hasFill();
281 if (!hasVisibleStroke) 280 if (!hasVisibleStroke)
282 hasVisibleStroke = svgSelectionStyle.hasVisibleStroke(); 281 hasVisibleStroke = svgSelectionStyle.hasVisibleStroke();
283 } else { 282 } else {
284 selectionStyle = style; 283 selectionStyle = style;
285 } 284 }
286 } 285 }
287 286
288 if (textRenderer.frame() && textRenderer.frame()->view() && textRenderer.fra me()->view()->paintBehavior() & PaintBehaviorRenderingSVGMask) { 287 if (SVGRenderSupport::isRenderingMaskImage(textRenderer)) {
289 hasFill = true; 288 hasFill = true;
290 hasVisibleStroke = false; 289 hasVisibleStroke = false;
291 } 290 }
292 291
293 AffineTransform fragmentTransform; 292 AffineTransform fragmentTransform;
294 unsigned textFragmentsSize = m_textFragments.size(); 293 unsigned textFragmentsSize = m_textFragments.size();
295 for (unsigned i = 0; i < textFragmentsSize; ++i) { 294 for (unsigned i = 0; i < textFragmentsSize; ++i) {
296 SVGTextFragment& fragment = m_textFragments.at(i); 295 SVGTextFragment& fragment = m_textFragments.at(i);
297 296
298 GraphicsContextStateSaver stateSaver(*paintInfo.context, false); 297 GraphicsContextStateSaver stateSaver(*paintInfo.context, false);
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 renderer().updateHitTestResult(result, locationInContainer.point () - toLayoutSize(accumulatedOffset)); 756 renderer().updateHitTestResult(result, locationInContainer.point () - toLayoutSize(accumulatedOffset));
758 if (!result.addNodeToRectBasedTestResult(renderer().node(), requ est, locationInContainer, rect)) 757 if (!result.addNodeToRectBasedTestResult(renderer().node(), requ est, locationInContainer, rect))
759 return true; 758 return true;
760 } 759 }
761 } 760 }
762 } 761 }
763 return false; 762 return false;
764 } 763 }
765 764
766 } // namespace blink 765 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698