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

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

Issue 301353005: Remove hasFallbackContent from RenderEmbeddedObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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/HTMLPlugInElement.h ('k') | Source/core/rendering/RenderEmbeddedObject.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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 ASSERT(renderer); 430 ASSERT(renderer);
431 if (!renderer) 431 if (!renderer)
432 return false; 432 return false;
433 433
434 KURL completedURL = document().completeURL(url); 434 KURL completedURL = document().completeURL(url);
435 if (!pluginIsLoadable(completedURL, mimeType)) 435 if (!pluginIsLoadable(completedURL, mimeType))
436 return false; 436 return false;
437 437
438 bool useFallback; 438 bool useFallback;
439 bool requireRenderer = true; 439 bool requireRenderer = true;
440 if (shouldUsePlugin(completedURL, mimeType, renderer->hasFallbackContent(), useFallback)) 440 if (shouldUsePlugin(completedURL, mimeType, hasFallbackContent(), useFallbac k))
441 return loadPlugin(completedURL, mimeType, paramNames, paramValues, useFa llback, requireRenderer); 441 return loadPlugin(completedURL, mimeType, paramNames, paramValues, useFa llback, requireRenderer);
442 442
443 // If the plug-in element already contains a subframe, 443 // If the plug-in element already contains a subframe,
444 // loadOrRedirectSubframe will re-use it. Otherwise, it will create a new 444 // loadOrRedirectSubframe will re-use it. Otherwise, it will create a new
445 // frame and set it as the RenderPart's widget, causing what was previously 445 // frame and set it as the RenderPart's widget, causing what was previously
446 // in the widget to be torn down. 446 // in the widget to be torn down.
447 return loadOrRedirectSubframe(completedURL, getNameAttribute(), true); 447 return loadOrRedirectSubframe(completedURL, getNameAttribute(), true);
448 } 448 }
449 449
450 bool HTMLPlugInElement::loadPlugin(const KURL& url, const String& mimeType, cons t Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallbac k, bool requireRenderer) 450 bool HTMLPlugInElement::loadPlugin(const KURL& url, const String& mimeType, cons t Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallbac k, bool requireRenderer)
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 void HTMLPlugInElement::didAddUserAgentShadowRoot(ShadowRoot&) 548 void HTMLPlugInElement::didAddUserAgentShadowRoot(ShadowRoot&)
549 { 549 {
550 userAgentShadowRoot()->appendChild(HTMLContentElement::create(document())); 550 userAgentShadowRoot()->appendChild(HTMLContentElement::create(document()));
551 } 551 }
552 552
553 void HTMLPlugInElement::willAddFirstAuthorShadowRoot() 553 void HTMLPlugInElement::willAddFirstAuthorShadowRoot()
554 { 554 {
555 lazyReattachIfAttached(); 555 lazyReattachIfAttached();
556 } 556 }
557 557
558 bool HTMLPlugInElement::hasFallbackContent() const
559 {
560 return false;
561 }
562
558 bool HTMLPlugInElement::useFallbackContent() const 563 bool HTMLPlugInElement::useFallbackContent() const
559 { 564 {
560 return hasAuthorShadowRoot(); 565 return hasAuthorShadowRoot();
561 } 566 }
562 567
563 } 568 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLPlugInElement.h ('k') | Source/core/rendering/RenderEmbeddedObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698