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

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

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/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
OLDNEW
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 PaintInfo pi(paintInfo); 63 PaintInfo pi(paintInfo);
64 pi.rect = absoluteTransform().inverse().mapRect(paintInfo.rect); 64 pi.rect = absoluteTransform().inverse().mapRect(paintInfo.rect);
65 RenderBlock::paint(pi, 0, 0); 65 RenderBlock::paint(pi, 0, 0);
66 66
67 if (opacity < 1.0f) 67 if (opacity < 1.0f)
68 paintInfo.context->endTransparencyLayer(); 68 paintInfo.context->endTransparencyLayer();
69 69
70 paintInfo.context->restore(); 70 paintInfo.context->restore();
71 } 71 }
72 72
73 void RenderForeignObject::computeRectForRepaint(RenderBoxModelObject* repaintCon tainer, IntRect& rect, bool fixed) 73 void RenderForeignObject::computeRectForRepaint(RenderBox* repaintContainer, Int Rect& rect, bool fixed)
74 { 74 {
75 TransformationMatrix transform = translationForAttributes() * localTransform (); 75 TransformationMatrix transform = translationForAttributes() * localTransform ();
76 rect = transform.mapRect(rect); 76 rect = transform.mapRect(rect);
77 77
78 RenderBlock::computeRectForRepaint(repaintContainer, rect, fixed); 78 RenderBlock::computeRectForRepaint(repaintContainer, rect, fixed);
79 } 79 }
80 80
81 bool RenderForeignObject::calculateLocalTransform() 81 bool RenderForeignObject::calculateLocalTransform()
82 { 82 {
83 TransformationMatrix oldTransform = m_localTransform; 83 TransformationMatrix oldTransform = m_localTransform;
(...skipping 28 matching lines...) Expand all
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)
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderForeignObject.h ('k') | third_party/WebKit/WebCore/rendering/RenderInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698