Source/core/rendering/svg/RenderSVGImage.h - Issue 551043006: Use correct viewport for intrinsic size-less SVG images in <svg:image>

Side by Side Diff: Source/core/rendering/svg/RenderSVGImage.h

Issue 551043006: Use correct viewport for intrinsic size-less SVG images in <svg:image> (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Shuffle code; Add additional test. Created 6 years, 3 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 | « LayoutTests/svg/custom/svg-image-par-none-zero-intrinsic-size-expected.html ('k') | Source/core/rendering/svg/RenderSVGImage.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>	2 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>

3 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.	3 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.

4 * Copyright (C) 2007 Rob Buis <buis@kde.org>	4 * Copyright (C) 2007 Rob Buis <buis@kde.org>

5 * Copyright (C) 2009 Google, Inc.	5 * Copyright (C) 2009 Google, Inc.

6 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>	6 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>

7 *	7 *

8 * This library is free software; you can redistribute it and/or	8 * This library is free software; you can redistribute it and/or

9 * modify it under the terms of the GNU Library General Public	9 * modify it under the terms of the GNU Library General Public

10 * License as published by the Free Software Foundation; either	10 * License as published by the Free Software Foundation; either

(...skipping 45 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 virtual FloatRect strokeBoundingBox() const OVERRIDE { return m_objectBoundi ngBox; }	56 virtual FloatRect strokeBoundingBox() const OVERRIDE { return m_objectBoundi ngBox; }

57 virtual FloatRect paintInvalidationRectInLocalCoordinates() const OVERRIDE { return m_paintInvalidationBoundingBox; }	57 virtual FloatRect paintInvalidationRectInLocalCoordinates() const OVERRIDE { return m_paintInvalidationBoundingBox; }

58	58

59 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const OVERRIDE;	59 virtual void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& addit ionalOffset, const RenderLayerModelObject* paintContainer) const OVERRIDE;

60	60

61 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;	61 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) OVERRIDE;

62	62

63 virtual void layout() OVERRIDE;	63 virtual void layout() OVERRIDE;

64 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;	64 virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;

65	65

	66 bool forceNonUniformScaling(SVGImageElement*) const;

66 void invalidateBufferedForeground();	67 void invalidateBufferedForeground();

67	68

68 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) OVERRIDE;	69 virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const F loatPoint& pointInParent, HitTestAction) OVERRIDE;

69	70

70 virtual AffineTransform localTransform() const OVERRIDE { return m_localTran sform; }	71 virtual AffineTransform localTransform() const OVERRIDE { return m_localTran sform; }

71	72

72 bool m_needsBoundariesUpdate : 1;	73 bool m_needsBoundariesUpdate : 1;

73 bool m_needsTransformUpdate : 1;	74 bool m_needsTransformUpdate : 1;

74 AffineTransform m_localTransform;	75 AffineTransform m_localTransform;

75 FloatRect m_objectBoundingBox;	76 FloatRect m_objectBoundingBox;

76 FloatRect m_paintInvalidationBoundingBox;	77 FloatRect m_paintInvalidationBoundingBox;

77 OwnPtr<RenderImageResource> m_imageResource;	78 OwnPtr<RenderImageResource> m_imageResource;

78	79

79 OwnPtr<ImageBuffer> m_bufferedForeground;	80 OwnPtr<ImageBuffer> m_bufferedForeground;

80 };	81 };

81	82

82 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGImage, isSVGImage());	83 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGImage, isSVGImage());

83	84

84 } // namespace blink	85 } // namespace blink

85	86

86 #endif // RenderSVGImage_h	87 #endif // RenderSVGImage_h

OLD	NEW