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

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

Issue 979833002: Remove check from HTMLPlugInElement::requestObject (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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 | « no previous file | 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 } 494 }
495 495
496 bool HTMLPlugInElement::requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) 496 bool HTMLPlugInElement::requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
497 { 497 {
498 if (url.isEmpty() && mimeType.isEmpty()) 498 if (url.isEmpty() && mimeType.isEmpty())
499 return false; 499 return false;
500 500
501 if (protocolIsJavaScript(url)) 501 if (protocolIsJavaScript(url))
502 return false; 502 return false;
503 503
504 // FIXME: None of this code should use renderers!
505 LayoutEmbeddedObject* renderer = layoutEmbeddedObject();
506 ASSERT(renderer);
507 if (!renderer)
508 return false;
509
510 KURL completedURL = document().completeURL(url); 504 KURL completedURL = document().completeURL(url);
511 if (!pluginIsLoadable(completedURL, mimeType)) 505 if (!pluginIsLoadable(completedURL, mimeType))
512 return false; 506 return false;
513 507
514 bool useFallback; 508 bool useFallback;
515 bool requireRenderer = true; 509 bool requireRenderer = true;
Nate Chapin 2015/03/04 17:36:55 While we're here, inline this variable in the load
516 if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent(), useFallbac k)) 510 if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent(), useFallbac k))
517 return loadPlugin(completedURL, mimeType, paramNames, paramValues, useFa llback, requireRenderer); 511 return loadPlugin(completedURL, mimeType, paramNames, paramValues, useFa llback, requireRenderer);
518 512
519 // If the plug-in element already contains a subframe, 513 // If the plug-in element already contains a subframe,
520 // loadOrRedirectSubframe will re-use it. Otherwise, it will create a new 514 // loadOrRedirectSubframe will re-use it. Otherwise, it will create a new
521 // frame and set it as the LayoutPart's widget, causing what was previously 515 // frame and set it as the LayoutPart's widget, causing what was previously
522 // in the widget to be torn down. 516 // in the widget to be torn down.
523 return loadOrRedirectSubframe(completedURL, getNameAttribute(), true, CheckC ontentSecurityPolicy); 517 return loadOrRedirectSubframe(completedURL, getNameAttribute(), true, CheckC ontentSecurityPolicy);
524 } 518 }
525 519
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 return hasOpenShadowRoot(); 666 return hasOpenShadowRoot();
673 } 667 }
674 668
675 void HTMLPlugInElement::lazyReattachIfNeeded() 669 void HTMLPlugInElement::lazyReattachIfNeeded()
676 { 670 {
677 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && renderer() && !isImageType()) 671 if (!useFallbackContent() && !usePlaceholderContent() && needsWidgetUpdate() && renderer() && !isImageType())
678 lazyReattachIfAttached(); 672 lazyReattachIfAttached();
679 } 673 }
680 674
681 } 675 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698