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

Side by Side Diff: Source/WebCore/rendering/RenderWidget.cpp

Issue 10870077: Merge 126042 - [chromium] pepper plugins sometimes are shifted by 1 pixel (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) 3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 #if USE(ACCELERATED_COMPOSITING) 169 #if USE(ACCELERATED_COMPOSITING)
170 if (hasLayer() && layer()->isComposited()) 170 if (hasLayer() && layer()->isComposited())
171 layer()->backing()->updateAfterWidgetResize(); 171 layer()->backing()->updateAfterWidgetResize();
172 #endif 172 #endif
173 173
174 return boundsChanged; 174 return boundsChanged;
175 } 175 }
176 176
177 bool RenderWidget::updateWidgetGeometry() 177 bool RenderWidget::updateWidgetGeometry()
178 { 178 {
179 IntRect contentBox = pixelSnappedIntRect(contentBoxRect()); 179 LayoutRect contentBox = contentBoxRect();
180 if (!m_widget->transformsAffectFrameRect()) 180 if (!m_widget->transformsAffectFrameRect())
181 return setWidgetGeometry(absoluteContentBox()); 181 return setWidgetGeometry(absoluteContentBox());
182 182
183 IntRect absoluteContentBox(localToAbsoluteQuad(FloatQuad(contentBox)).boundi ngBox()); 183 LayoutRect absoluteContentBox(localToAbsoluteQuad(FloatQuad(contentBox)).bou ndingBox());
184 if (m_widget->isFrameView()) { 184 if (m_widget->isFrameView()) {
185 contentBox.setLocation(absoluteContentBox.location()); 185 contentBox.setLocation(absoluteContentBox.location());
186 return setWidgetGeometry(contentBox); 186 return setWidgetGeometry(contentBox);
187 } 187 }
188 188
189 return setWidgetGeometry(absoluteContentBox); 189 return setWidgetGeometry(absoluteContentBox);
190 } 190 }
191 191
192 void RenderWidget::setWidget(PassRefPtr<Widget> widget) 192 void RenderWidget::setWidget(PassRefPtr<Widget> widget)
193 { 193 {
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const 399 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const
400 { 400 {
401 if (widget() && widget()->isPluginViewBase()) { 401 if (widget() && widget()->isPluginViewBase()) {
402 // A plug-in is responsible for setting the cursor when the pointer is o ver it. 402 // A plug-in is responsible for setting the cursor when the pointer is o ver it.
403 return DoNotSetCursor; 403 return DoNotSetCursor;
404 } 404 }
405 return RenderReplaced::getCursor(point, cursor); 405 return RenderReplaced::getCursor(point, cursor);
406 } 406 }
407 407
408 } // namespace WebCore 408 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698