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

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

Powered by Google App Engine
This is Rietveld 408576698