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

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

Issue 1319673003: Reland of move javaEnabled setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLAppletElement.cpp ('k') | Source/modules/plugins/NavigatorPlugins.h » ('j') | 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 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 bool HTMLPlugInElement::pluginIsLoadable(const KURL& url, const String& mimeType ) 612 bool HTMLPlugInElement::pluginIsLoadable(const KURL& url, const String& mimeType )
613 { 613 {
614 if (url.isEmpty() && mimeType.isEmpty()) 614 if (url.isEmpty() && mimeType.isEmpty())
615 return false; 615 return false;
616 616
617 LocalFrame* frame = document().frame(); 617 LocalFrame* frame = document().frame();
618 Settings* settings = frame->settings(); 618 Settings* settings = frame->settings();
619 if (!settings) 619 if (!settings)
620 return false; 620 return false;
621 621
622 if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType) && !settings->javaEnabl ed()) 622 if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType))
623 return false; 623 return false;
624 624
625 if (document().isSandboxed(SandboxPlugins)) 625 if (document().isSandboxed(SandboxPlugins))
626 return false; 626 return false;
627 627
628 if (!document().securityOrigin()->canDisplay(url)) { 628 if (!document().securityOrigin()->canDisplay(url)) {
629 FrameLoader::reportLocalLoadFailed(frame, url.string()); 629 FrameLoader::reportLocalLoadFailed(frame, url.string());
630 return false; 630 return false;
631 } 631 }
632 632
(...skipping 29 matching lines...) Expand all
662 return openShadowRoot(); 662 return openShadowRoot();
663 } 663 }
664 664
665 void HTMLPlugInElement::lazyReattachIfNeeded() 665 void HTMLPlugInElement::lazyReattachIfNeeded()
666 { 666 {
667 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && layoutObject() && !isImageType()) 667 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && layoutObject() && !isImageType())
668 lazyReattachIfAttached(); 668 lazyReattachIfAttached();
669 } 669 }
670 670
671 } 671 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLAppletElement.cpp ('k') | Source/modules/plugins/NavigatorPlugins.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698