third_party/WebKit/WebCore/rendering/RenderForeignObject.cpp - Issue 21184: WebKit merge 40722:40785 (part 1)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderForeignObject.cpp

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 11 years, 10 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

OLD	NEW
1 /*	1 /*

2 * This file is part of the WebKit project.	2 * This file is part of the WebKit project.

3 *	3 *

4 * Copyright (C) 2006 Apple Computer, Inc.	4 * Copyright (C) 2006 Apple Computer, Inc.

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 *

(...skipping 94 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
105	105

106 view()->enableLayoutState();	106 view()->enableLayoutState();

107 setNeedsLayout(false);	107 setNeedsLayout(false);

108 }	108 }

109	109

110 bool RenderForeignObject::nodeAtPoint(const HitTestRequest& request, HitTestResu lt& result, int x, int y, int tx, int ty, HitTestAction hitTestAction)	110 bool RenderForeignObject::nodeAtPoint(const HitTestRequest& request, HitTestResu lt& result, int x, int y, int tx, int ty, HitTestAction hitTestAction)

111 {	111 {

112 TransformationMatrix totalTransform = absoluteTransform();	112 TransformationMatrix totalTransform = absoluteTransform();

113 totalTransform *= translationForAttributes();	113 totalTransform *= translationForAttributes();

114 double localX, localY;	114 double localX, localY;

115 totalTransform.inverse().map(x, y, &localX, &localY);	115 totalTransform.inverse().map(x, y, localX, localY);

116 return RenderBlock::nodeAtPoint(request, result, static_cast<int>(localX), s tatic_cast<int>(localY), tx, ty, hitTestAction);	116 return RenderBlock::nodeAtPoint(request, result, static_cast<int>(localX), s tatic_cast<int>(localY), tx, ty, hitTestAction);

117 }	117 }

118	118

119 } // namespace WebCore	119 } // namespace WebCore

120	120

121 #endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)	121 #endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)

OLD	NEW