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

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: Address comments. Created 7 years 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 28 matching lines...) Expand all
39 namespace WebCore { 39 namespace WebCore {
40 40
41 RenderPart::RenderPart(Element* node) 41 RenderPart::RenderPart(Element* node)
42 : RenderWidget(node) 42 : RenderWidget(node)
43 { 43 {
44 setInline(false); 44 setInline(false);
45 } 45 }
46 46
47 RenderPart::~RenderPart() 47 RenderPart::~RenderPart()
48 { 48 {
49 clearWidget();
50 }
51
52 void RenderPart::setWidget(PassRefPtr<Widget> widget)
53 {
54 if (widget == this->widget())
55 return;
56
57 RenderWidget::setWidget(widget);
58
59 // make sure the scrollbars are set correctly for restore
60 // ### find better fix
61 viewCleared();
62 } 49 }
63 50
64 void RenderPart::viewCleared() 51 void RenderPart::viewCleared()
65 { 52 {
66 } 53 }
67 54
68 bool RenderPart::requiresLayer() const 55 bool RenderPart::requiresLayer() const
69 { 56 {
70 if (RenderWidget::requiresLayer()) 57 if (RenderWidget::requiresLayer())
71 return true; 58 return true;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 Scrollbar* frameScrollbar = childFrameView->scrollbarAtPoint(newHitT estLocation.roundedPoint()); 130 Scrollbar* frameScrollbar = childFrameView->scrollbarAtPoint(newHitT estLocation.roundedPoint());
144 if (frameScrollbar) 131 if (frameScrollbar)
145 result.setScrollbar(frameScrollbar); 132 result.setScrollbar(frameScrollbar);
146 } 133 }
147 } 134 }
148 135
149 return RenderWidget::nodeAtPoint(request, result, locationInContainer, accum ulatedOffset, action); 136 return RenderWidget::nodeAtPoint(request, result, locationInContainer, accum ulatedOffset, action);
150 } 137 }
151 138
152 } 139 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698