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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

Issue 2811793005: Rename LocalFrame::Script() to GetScriptController() (Closed)
Patch Set: Created 3 years, 8 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
OLDNEW
1 /** 1 /**
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 5 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
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 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 // return the cached allocated Bindings::Instance. Not supporting this 371 // return the cached allocated Bindings::Instance. Not supporting this
372 // edge-case is OK. 372 // edge-case is OK.
373 if (!plugin_wrapper_) { 373 if (!plugin_wrapper_) {
374 PluginView* plugin; 374 PluginView* plugin;
375 375
376 if (persisted_plugin_) 376 if (persisted_plugin_)
377 plugin = persisted_plugin_.Get(); 377 plugin = persisted_plugin_.Get();
378 else 378 else
379 plugin = PluginWidget(); 379 plugin = PluginWidget();
380 380
381 if (plugin) 381 if (plugin) {
382 plugin_wrapper_ = frame->Script().CreatePluginWrapper(*plugin); 382 plugin_wrapper_ =
383 frame->GetScriptController().CreatePluginWrapper(*plugin);
384 }
383 } 385 }
384 return plugin_wrapper_.Get(); 386 return plugin_wrapper_.Get();
385 } 387 }
386 388
387 PluginView* HTMLPlugInElement::PluginWidget() const { 389 PluginView* HTMLPlugInElement::PluginWidget() const {
388 if (LayoutPart* layout_part = LayoutPartForJSBindings()) 390 if (LayoutPart* layout_part = LayoutPartForJSBindings())
389 return layout_part->Plugin(); 391 return layout_part->Plugin();
390 return nullptr; 392 return nullptr;
391 } 393 }
392 394
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 701
700 void HTMLPlugInElement::LazyReattachIfNeeded() { 702 void HTMLPlugInElement::LazyReattachIfNeeded() {
701 if (!UseFallbackContent() && NeedsPluginUpdate() && GetLayoutObject() && 703 if (!UseFallbackContent() && NeedsPluginUpdate() && GetLayoutObject() &&
702 !IsImageType()) { 704 !IsImageType()) {
703 LazyReattachIfAttached(); 705 LazyReattachIfAttached();
704 SetPersistedPlugin(nullptr); 706 SetPersistedPlugin(nullptr);
705 } 707 }
706 } 708 }
707 709
708 } // namespace blink 710 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698