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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp

Issue 2065593002: Unprefix the CSS 'filter' property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove disabler. Try different DCHECK expressions. Created 4 years, 6 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) 2007, 2008 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007, 2008 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) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Google, Inc. All rights reserved. 5 * Copyright (C) 2009 Google, Inc. All rights reserved.
6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
7 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 ASSERT(object->isText()); 431 ASSERT(object->isText());
432 // <br> is marked as text, but is not handled by the SVG layout code-path. 432 // <br> is marked as text, but is not handled by the SVG layout code-path.
433 return object->isSVGInlineText() && !toLayoutSVGInlineText(object)->hasEmpty Text(); 433 return object->isSVGInlineText() && !toLayoutSVGInlineText(object)->hasEmpty Text();
434 } 434 }
435 435
436 bool SVGLayoutSupport::willIsolateBlendingDescendantsForStyle(const ComputedStyl e& style) 436 bool SVGLayoutSupport::willIsolateBlendingDescendantsForStyle(const ComputedStyl e& style)
437 { 437 {
438 const SVGComputedStyle& svgStyle = style.svgStyle(); 438 const SVGComputedStyle& svgStyle = style.svgStyle();
439 439
440 return style.hasIsolation() || style.opacity() < 1 || style.hasBlendMode() 440 return style.hasIsolation() || style.opacity() < 1 || style.hasBlendMode()
441 || svgStyle.hasFilter() || svgStyle.hasMasker() || svgStyle.hasClipper() ; 441 || style.hasFilter() || svgStyle.hasMasker() || svgStyle.hasClipper();
442 } 442 }
443 443
444 bool SVGLayoutSupport::willIsolateBlendingDescendantsForObject(const LayoutObjec t* object) 444 bool SVGLayoutSupport::willIsolateBlendingDescendantsForObject(const LayoutObjec t* object)
445 { 445 {
446 if (object->isSVGHiddenContainer()) 446 if (object->isSVGHiddenContainer())
447 return false; 447 return false;
448 if (!object->isSVGRoot() && !object->isSVGContainer()) 448 if (!object->isSVGRoot() && !object->isSVGContainer())
449 return false; 449 return false;
450 return willIsolateBlendingDescendantsForStyle(object->styleRef()); 450 return willIsolateBlendingDescendantsForStyle(object->styleRef());
451 } 451 }
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 577
578 return closestText; 578 return closestText;
579 } 579 }
580 580
581 LayoutObject* SVGLayoutSupport::findClosestLayoutSVGText(LayoutObject* layoutObj ect, const FloatPoint& point) 581 LayoutObject* SVGLayoutSupport::findClosestLayoutSVGText(LayoutObject* layoutObj ect, const FloatPoint& point)
582 { 582 {
583 return searchTreeForFindClosestLayoutSVGText(layoutObject, point).candidateL ayoutObject; 583 return searchTreeForFindClosestLayoutSVGText(layoutObject, point).candidateL ayoutObject;
584 } 584 }
585 585
586 } // namespace blink 586 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698