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

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

Issue 285483003: Correctly update size when a plugin has a transform. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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 * Copyright (C) 2013 Google Inc. All rights reserved. 5 * Copyright (C) 2013 Google Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 return widget->frameRect().size() != newFrame.size(); 115 return widget->frameRect().size() != newFrame.size();
116 } 116 }
117 117
118 bool RenderWidget::updateWidgetGeometry() 118 bool RenderWidget::updateWidgetGeometry()
119 { 119 {
120 Widget* widget = this->widget(); 120 Widget* widget = this->widget();
121 ASSERT(widget); 121 ASSERT(widget);
122 122
123 LayoutRect contentBox = contentBoxRect(); 123 LayoutRect contentBox = contentBoxRect();
124 LayoutRect absoluteContentBox(localToAbsoluteQuad(FloatQuad(contentBox)).bou ndingBox()); 124 LayoutRect absoluteContentBox(localToAbsoluteQuad(FloatQuad(contentBox)).bou ndingBox());
125 if (widget->isFrameView()) { 125 if (widget->isFrameView() || widget->isPluginContainer()) {
126 contentBox.setLocation(absoluteContentBox.location()); 126 contentBox.setLocation(absoluteContentBox.location());
127 return setWidgetGeometry(contentBox); 127 return setWidgetGeometry(contentBox);
128 } 128 }
129 129
130 return setWidgetGeometry(absoluteContentBox); 130 return setWidgetGeometry(absoluteContentBox);
131 } 131 }
132 132
133 void RenderWidget::layout() 133 void RenderWidget::layout()
134 { 134 {
135 ASSERT(needsLayout()); 135 ASSERT(needsLayout());
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const 315 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const
316 { 316 {
317 if (widget() && widget()->isPluginView()) { 317 if (widget() && widget()->isPluginView()) {
318 // A plug-in is responsible for setting the cursor when the pointer is o ver it. 318 // A plug-in is responsible for setting the cursor when the pointer is o ver it.
319 return DoNotSetCursor; 319 return DoNotSetCursor;
320 } 320 }
321 return RenderReplaced::getCursor(point, cursor); 321 return RenderReplaced::getCursor(point, cursor);
322 } 322 }
323 323
324 } // namespace WebCore 324 } // 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