OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2004, 2005, 2007, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2005, 2007, 2009 Apple Inc. All rights reserved. |
3 * (C) 2005 Rob Buis <buis@kde.org> | 3 * (C) 2005 Rob Buis <buis@kde.org> |
4 * (C) 2006 Alexander Kellett <lypanov@kde.org> | 4 * (C) 2006 Alexander Kellett <lypanov@kde.org> |
5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
6 * | 6 * |
7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
9 * are met: | 9 * are met: |
10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
619 | 619 |
620 void writeResources(TextStream& ts, const RenderObject& object, int indent) | 620 void writeResources(TextStream& ts, const RenderObject& object, int indent) |
621 { | 621 { |
622 const RenderStyle* style = object.style(); | 622 const RenderStyle* style = object.style(); |
623 const SVGRenderStyle* svgStyle = style->svgStyle(); | 623 const SVGRenderStyle* svgStyle = style->svgStyle(); |
624 | 624 |
625 // FIXME: We want to use SVGResourcesCache to determine which resources are present, instead of quering the resource <-> id cache. | 625 // FIXME: We want to use SVGResourcesCache to determine which resources are present, instead of quering the resource <-> id cache. |
626 // For now leave the DRT output as is, but later on we should change this so cycles are properly ignored in the DRT output. | 626 // For now leave the DRT output as is, but later on we should change this so cycles are properly ignored in the DRT output. |
627 RenderObject& renderer = const_cast<RenderObject&>(object); | 627 RenderObject& renderer = const_cast<RenderObject&>(object); |
628 if (!svgStyle->maskerResource().isEmpty()) { | 628 if (!svgStyle->maskerResource().isEmpty()) { |
629 if (RenderSVGResourceMasker* masker = getRenderSVGResourceById<RenderSVG ResourceMasker>(object.document(), svgStyle->maskerResource())) { | 629 if (RenderSVGResourceMasker* masker = getRenderSVGResourceById<RenderSVG ResourceMasker>(object.document(), AtomicString(svgStyle->maskerResource()))) { |
eseidel
2014/01/01 01:42:07
I should have made all of these AtomicSTrings n SV
Inactive
2014/01/01 16:12:59
Done.
| |
630 writeIndent(ts, indent); | 630 writeIndent(ts, indent); |
631 ts << " "; | 631 ts << " "; |
632 writeNameAndQuotedValue(ts, "masker", svgStyle->maskerResource()); | 632 writeNameAndQuotedValue(ts, "masker", svgStyle->maskerResource()); |
633 ts << " "; | 633 ts << " "; |
634 writeStandardPrefix(ts, *masker, 0); | 634 writeStandardPrefix(ts, *masker, 0); |
635 ts << " " << masker->resourceBoundingBox(&renderer) << "\n"; | 635 ts << " " << masker->resourceBoundingBox(&renderer) << "\n"; |
636 } | 636 } |
637 } | 637 } |
638 if (!svgStyle->clipperResource().isEmpty()) { | 638 if (!svgStyle->clipperResource().isEmpty()) { |
639 if (RenderSVGResourceClipper* clipper = getRenderSVGResourceById<RenderS VGResourceClipper>(object.document(), svgStyle->clipperResource())) { | 639 if (RenderSVGResourceClipper* clipper = getRenderSVGResourceById<RenderS VGResourceClipper>(object.document(), AtomicString(svgStyle->clipperResource())) ) { |
640 writeIndent(ts, indent); | 640 writeIndent(ts, indent); |
641 ts << " "; | 641 ts << " "; |
642 writeNameAndQuotedValue(ts, "clipPath", svgStyle->clipperResource()) ; | 642 writeNameAndQuotedValue(ts, "clipPath", svgStyle->clipperResource()) ; |
643 ts << " "; | 643 ts << " "; |
644 writeStandardPrefix(ts, *clipper, 0); | 644 writeStandardPrefix(ts, *clipper, 0); |
645 ts << " " << clipper->resourceBoundingBox(&renderer) << "\n"; | 645 ts << " " << clipper->resourceBoundingBox(&renderer) << "\n"; |
646 } | 646 } |
647 } | 647 } |
648 if (!svgStyle->filterResource().isEmpty()) { | 648 if (!svgStyle->filterResource().isEmpty()) { |
649 if (RenderSVGResourceFilter* filter = getRenderSVGResourceById<RenderSVG ResourceFilter>(object.document(), svgStyle->filterResource())) { | 649 if (RenderSVGResourceFilter* filter = getRenderSVGResourceById<RenderSVG ResourceFilter>(object.document(), AtomicString(svgStyle->filterResource()))) { |
650 writeIndent(ts, indent); | 650 writeIndent(ts, indent); |
651 ts << " "; | 651 ts << " "; |
652 writeNameAndQuotedValue(ts, "filter", svgStyle->filterResource()); | 652 writeNameAndQuotedValue(ts, "filter", svgStyle->filterResource()); |
653 ts << " "; | 653 ts << " "; |
654 writeStandardPrefix(ts, *filter, 0); | 654 writeStandardPrefix(ts, *filter, 0); |
655 ts << " " << filter->resourceBoundingBox(&renderer) << "\n"; | 655 ts << " " << filter->resourceBoundingBox(&renderer) << "\n"; |
656 } | 656 } |
657 } | 657 } |
658 } | 658 } |
659 | 659 |
660 } // namespace WebCore | 660 } // namespace WebCore |
OLD | NEW |