Source/WebCore/rendering/svg/RenderSVGModelObject.h - Issue 10540037: Merge 118608

Side by Side Diff: Source/WebCore/rendering/svg/RenderSVGModelObject.h

Issue 10540037: Merge 118608 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 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:

« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGInline.cpp ('k') | Source/WebCore/rendering/svg/RenderSVGModelObject.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2009, Google Inc. All rights reserved.	2 * Copyright (c) 2009, Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repai ntContainer) const;	54 virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repai ntContainer) const;

55 virtual void computeFloatRectForRepaint(RenderBoxModelObject* repaintContain er, FloatRect&, bool fixed = false) const;	55 virtual void computeFloatRectForRepaint(RenderBoxModelObject* repaintContain er, FloatRect&, bool fixed = false) const;

56 virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* repaintCont ainer, LayoutPoint*) const;	56 virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* repaintCont ainer, LayoutPoint*) const;

57	57

58 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const;	58 virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedO ffset) const;

59 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const;	59 virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const;

60	60

61 virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, boo l useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyCon tainerFlip, bool* wasFixed = 0) const;	61 virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, boo l useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyCon tainerFlip, bool* wasFixed = 0) const;

62 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);	62 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);

63 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);	63 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);

64 virtual void updateFromElement();

65	64

66 static bool checkIntersection(RenderObject*, const FloatRect&);	65 static bool checkIntersection(RenderObject*, const FloatRect&);

67 static bool checkEnclosure(RenderObject*, const FloatRect&);	66 static bool checkEnclosure(RenderObject*, const FloatRect&);

68	67

69 protected:	68 protected:

70 virtual void willBeDestroyed();	69 virtual void willBeDestroyed();

71	70

72 private:	71 private:

73 // This method should never be called, SVG uses a different nodeAtPoint meth od	72 // This method should never be called, SVG uses a different nodeAtPoint meth od

74 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& p ointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);	73 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& p ointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);

75 };	74 };

76	75

77 }	76 }

78	77

79 #endif // ENABLE(SVG)	78 #endif // ENABLE(SVG)

80 #endif	79 #endif

OLD	NEW