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

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

Issue 23728003: Return Frame&, not Frame* from RenderView::frame() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed PopupMenuTest build Created 7 years, 3 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
« no previous file with comments | « Source/core/rendering/RenderView.cpp ('k') | Source/web/PopupContainer.cpp » ('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 * 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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 if (!m_widget || !node()) // Check the node in case destroy() has been calle d. 323 if (!m_widget || !node()) // Check the node in case destroy() has been calle d.
324 return; 324 return;
325 325
326 bool boundsChanged = updateWidgetGeometry(); 326 bool boundsChanged = updateWidgetGeometry();
327 327
328 // if the frame bounds got changed, or if view needs layout (possibly indica ting 328 // if the frame bounds got changed, or if view needs layout (possibly indica ting
329 // content size is wrong) we have to do a layout to set the right widget siz e 329 // content size is wrong) we have to do a layout to set the right widget siz e
330 if (m_widget && m_widget->isFrameView()) { 330 if (m_widget && m_widget->isFrameView()) {
331 FrameView* frameView = toFrameView(m_widget.get()); 331 FrameView* frameView = toFrameView(m_widget.get());
332 // Check the frame's page to make sure that the frame isn't in the proce ss of being destroyed. 332 // Check the frame's page to make sure that the frame isn't in the proce ss of being destroyed.
333 if ((boundsChanged || frameView->needsLayout()) && frameView->frame()->p age()) 333 if ((boundsChanged || frameView->needsLayout()) && frameView->frame().pa ge())
334 frameView->layout(); 334 frameView->layout();
335 } 335 }
336 } 336 }
337 337
338 void RenderWidget::widgetPositionsUpdated() 338 void RenderWidget::widgetPositionsUpdated()
339 { 339 {
340 if (!m_widget) 340 if (!m_widget)
341 return; 341 return;
342 m_widget->widgetPositionsUpdated(); 342 m_widget->widgetPositionsUpdated();
343 } 343 }
(...skipping 30 matching lines...) Expand all
374 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const 374 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor ) const
375 { 375 {
376 if (widget() && widget()->isPluginView()) { 376 if (widget() && widget()->isPluginView()) {
377 // A plug-in is responsible for setting the cursor when the pointer is o ver it. 377 // A plug-in is responsible for setting the cursor when the pointer is o ver it.
378 return DoNotSetCursor; 378 return DoNotSetCursor;
379 } 379 }
380 return RenderReplaced::getCursor(point, cursor); 380 return RenderReplaced::getCursor(point, cursor);
381 } 381 }
382 382
383 } // namespace WebCore 383 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderView.cpp ('k') | Source/web/PopupContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698