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

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

Issue 12408009: Merge 144236 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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 | « Source/WebCore/plugins/PluginView.cpp ('k') | Source/WebKit/chromium/ChangeLog » ('j') | 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 bool boundsChanged = m_widget->frameRect() != frame; 147 bool boundsChanged = m_widget->frameRect() != frame;
148 148
149 if (!boundsChanged && !clipChanged) 149 if (!boundsChanged && !clipChanged)
150 return false; 150 return false;
151 151
152 m_clipRect = clipRect; 152 m_clipRect = clipRect;
153 153
154 RenderWidgetProtector protector(this); 154 RenderWidgetProtector protector(this);
155 RefPtr<Node> protectedNode(node()); 155 RefPtr<Node> protectedNode(node());
156 m_widget->setFrameRect(roundedIntRect(frame)); 156 m_widget->setFrameRect(roundedIntRect(frame));
157
158 if (clipChanged && !boundsChanged)
159 m_widget->clipRectChanged();
157 160
158 #if USE(ACCELERATED_COMPOSITING) 161 #if USE(ACCELERATED_COMPOSITING)
159 if (hasLayer() && layer()->isComposited()) 162 if (hasLayer() && layer()->isComposited())
160 layer()->backing()->updateAfterWidgetResize(); 163 layer()->backing()->updateAfterWidgetResize();
161 #endif 164 #endif
162 165
163 return boundsChanged; 166 return boundsChanged;
164 } 167 }
165 168
166 bool RenderWidget::updateWidgetGeometry() 169 bool RenderWidget::updateWidgetGeometry()
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const 397 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const
395 { 398 {
396 if (widget() && widget()->isPluginViewBase()) { 399 if (widget() && widget()->isPluginViewBase()) {
397 // A plug-in is responsible for setting the cursor when the pointer is o ver it. 400 // A plug-in is responsible for setting the cursor when the pointer is o ver it.
398 return DoNotSetCursor; 401 return DoNotSetCursor;
399 } 402 }
400 return RenderReplaced::getCursor(point, cursor); 403 return RenderReplaced::getCursor(point, cursor);
401 } 404 }
402 405
403 } // namespace WebCore 406 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/plugins/PluginView.cpp ('k') | Source/WebKit/chromium/ChangeLog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698