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

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

Issue 2721473003: Renaming FrameLoaderClient with LocalFrameClient for files in core/html (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLObjectElement.cpp ('k') | no next file » | 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 * (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 13 matching lines...) Expand all
24 24
25 #include "bindings/core/v8/ScriptController.h" 25 #include "bindings/core/v8/ScriptController.h"
26 #include "core/CSSPropertyNames.h" 26 #include "core/CSSPropertyNames.h"
27 #include "core/HTMLNames.h" 27 #include "core/HTMLNames.h"
28 #include "core/dom/Document.h" 28 #include "core/dom/Document.h"
29 #include "core/dom/Node.h" 29 #include "core/dom/Node.h"
30 #include "core/dom/shadow/ShadowRoot.h" 30 #include "core/dom/shadow/ShadowRoot.h"
31 #include "core/events/Event.h" 31 #include "core/events/Event.h"
32 #include "core/frame/FrameView.h" 32 #include "core/frame/FrameView.h"
33 #include "core/frame/LocalFrame.h" 33 #include "core/frame/LocalFrame.h"
34 #include "core/frame/LocalFrameClient.h"
34 #include "core/frame/Settings.h" 35 #include "core/frame/Settings.h"
35 #include "core/frame/csp/ContentSecurityPolicy.h" 36 #include "core/frame/csp/ContentSecurityPolicy.h"
36 #include "core/html/HTMLContentElement.h" 37 #include "core/html/HTMLContentElement.h"
37 #include "core/html/HTMLImageLoader.h" 38 #include "core/html/HTMLImageLoader.h"
38 #include "core/html/PluginDocument.h" 39 #include "core/html/PluginDocument.h"
39 #include "core/input/EventHandler.h" 40 #include "core/input/EventHandler.h"
40 #include "core/inspector/ConsoleMessage.h" 41 #include "core/inspector/ConsoleMessage.h"
41 #include "core/layout/LayoutImage.h" 42 #include "core/layout/LayoutImage.h"
42 #include "core/layout/LayoutPart.h" 43 #include "core/layout/LayoutPart.h"
43 #include "core/layout/api/LayoutEmbeddedItem.h" 44 #include "core/layout/api/LayoutEmbeddedItem.h"
44 #include "core/loader/FrameLoaderClient.h"
45 #include "core/loader/MixedContentChecker.h" 45 #include "core/loader/MixedContentChecker.h"
46 #include "core/page/Page.h" 46 #include "core/page/Page.h"
47 #include "core/page/scrolling/ScrollingCoordinator.h" 47 #include "core/page/scrolling/ScrollingCoordinator.h"
48 #include "core/plugins/PluginView.h" 48 #include "core/plugins/PluginView.h"
49 #include "platform/Histogram.h" 49 #include "platform/Histogram.h"
50 #include "platform/Widget.h" 50 #include "platform/Widget.h"
51 #include "platform/network/ResourceRequest.h" 51 #include "platform/network/ResourceRequest.h"
52 #include "platform/network/mime/MIMETypeFromURL.h" 52 #include "platform/network/mime/MIMETypeFromURL.h"
53 #include "platform/network/mime/MIMETypeRegistry.h" 53 #include "platform/network/mime/MIMETypeRegistry.h"
54 #include "platform/plugins/PluginData.h" 54 #include "platform/plugins/PluginData.h"
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 518
519 VLOG(1) << this << " Plugin URL: " << m_url; 519 VLOG(1) << this << " Plugin URL: " << m_url;
520 VLOG(1) << "Loaded URL: " << url.getString(); 520 VLOG(1) << "Loaded URL: " << url.getString();
521 m_loadedUrl = url; 521 m_loadedUrl = url;
522 522
523 if (m_persistedPluginWidget) { 523 if (m_persistedPluginWidget) {
524 setWidget(m_persistedPluginWidget.release()); 524 setWidget(m_persistedPluginWidget.release());
525 } else { 525 } else {
526 bool loadManually = 526 bool loadManually =
527 document().isPluginDocument() && !document().containsPlugins(); 527 document().isPluginDocument() && !document().containsPlugins();
528 FrameLoaderClient::DetachedPluginPolicy policy = 528 LocalFrameClient::DetachedPluginPolicy policy =
529 requireLayoutObject ? FrameLoaderClient::FailOnDetachedPlugin 529 requireLayoutObject ? LocalFrameClient::FailOnDetachedPlugin
530 : FrameLoaderClient::AllowDetachedPlugin; 530 : LocalFrameClient::AllowDetachedPlugin;
531 Widget* widget = frame->loader().client()->createPlugin( 531 Widget* widget = frame->loader().client()->createPlugin(
532 this, url, paramNames, paramValues, mimeType, loadManually, policy); 532 this, url, paramNames, paramValues, mimeType, loadManually, policy);
533 if (!widget) { 533 if (!widget) {
534 if (!layoutItem.isNull() && 534 if (!layoutItem.isNull() &&
535 !layoutItem.showsUnavailablePluginIndicator()) { 535 !layoutItem.showsUnavailablePluginIndicator()) {
536 m_pluginIsAvailable = false; 536 m_pluginIsAvailable = false;
537 layoutItem.setPluginAvailability(LayoutEmbeddedObject::PluginMissing); 537 layoutItem.setPluginAvailability(LayoutEmbeddedObject::PluginMissing);
538 } 538 }
539 return false; 539 return false;
540 } 540 }
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 646
647 void HTMLPlugInElement::lazyReattachIfNeeded() { 647 void HTMLPlugInElement::lazyReattachIfNeeded() {
648 if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() && 648 if (!useFallbackContent() && needsWidgetUpdate() && layoutObject() &&
649 !isImageType()) { 649 !isImageType()) {
650 lazyReattachIfAttached(); 650 lazyReattachIfAttached();
651 setPersistedPluginWidget(nullptr); 651 setPersistedPluginWidget(nullptr);
652 } 652 }
653 } 653 }
654 654
655 } // namespace blink 655 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLObjectElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698