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

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

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Don't store plugin (widget) pointer in RenderWidget. Created 7 years, 1 month 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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 if (widget == this->widget()) 53 if (widget == this->widget())
54 return; 54 return;
55 55
56 RenderWidget::setWidget(widget); 56 RenderWidget::setWidget(widget);
57 57
58 // make sure the scrollbars are set correctly for restore 58 // make sure the scrollbars are set correctly for restore
59 // ### find better fix 59 // ### find better fix
60 viewCleared(); 60 viewCleared();
61 } 61 }
62 62
63 void RenderPart::configureWidget(ConfigureType type)
64 {
65 RenderWidget::configureWidget(type);
66
67 viewCleared();
68 }
69
63 void RenderPart::viewCleared() 70 void RenderPart::viewCleared()
64 { 71 {
65 } 72 }
66 73
67 bool RenderPart::requiresLayer() const 74 bool RenderPart::requiresLayer() const
68 { 75 {
69 if (RenderWidget::requiresLayer()) 76 if (RenderWidget::requiresLayer())
70 return true; 77 return true;
71 78
72 return requiresAcceleratedCompositing(); 79 return requiresAcceleratedCompositing();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 Scrollbar* frameScrollbar = childFrameView->scrollbarAtPoint(newHitT estLocation.roundedPoint()); 146 Scrollbar* frameScrollbar = childFrameView->scrollbarAtPoint(newHitT estLocation.roundedPoint());
140 if (frameScrollbar) 147 if (frameScrollbar)
141 result.setScrollbar(frameScrollbar); 148 result.setScrollbar(frameScrollbar);
142 } 149 }
143 } 150 }
144 151
145 return RenderWidget::nodeAtPoint(request, result, locationInContainer, accum ulatedOffset, action); 152 return RenderWidget::nodeAtPoint(request, result, locationInContainer, accum ulatedOffset, action);
146 } 153 }
147 154
148 } 155 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698