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

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

Issue 241113002: Remove some dead code from html/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 m_serviceType = mimeTypeFromDataURL(m_url); 382 m_serviceType = mimeTypeFromDataURL(m_url);
383 383
384 if (LocalFrame* frame = document().frame()) { 384 if (LocalFrame* frame = document().frame()) {
385 KURL completedURL = document().completeURL(m_url); 385 KURL completedURL = document().completeURL(m_url);
386 return frame->loader().client()->objectContentType(completedURL, m_servi ceType, shouldPreferPlugInsForImages()) == ObjectContentImage; 386 return frame->loader().client()->objectContentType(completedURL, m_servi ceType, shouldPreferPlugInsForImages()) == ObjectContentImage;
387 } 387 }
388 388
389 return Image::supportsType(m_serviceType); 389 return Image::supportsType(m_serviceType);
390 } 390 }
391 391
392 const String HTMLPlugInElement::loadedMimeType() const
393 {
394 String mimeType = m_serviceType;
395 if (mimeType.isEmpty())
396 mimeType = mimeTypeFromURL(m_loadedUrl);
397 return mimeType;
398 }
399
400 RenderEmbeddedObject* HTMLPlugInElement::renderEmbeddedObject() const 392 RenderEmbeddedObject* HTMLPlugInElement::renderEmbeddedObject() const
401 { 393 {
402 // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers 394 // HTMLObjectElement and HTMLEmbedElement may return arbitrary renderers
403 // when using fallback content. 395 // when using fallback content.
404 if (!renderer() || !renderer()->isEmbeddedObject()) 396 if (!renderer() || !renderer()->isEmbeddedObject())
405 return 0; 397 return 0;
406 return toRenderEmbeddedObject(renderer()); 398 return toRenderEmbeddedObject(renderer());
407 } 399 }
408 400
409 // We don't use m_url, as it may not be the final URL that the object loads, 401 // We don't use m_url, as it may not be the final URL that the object loads,
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 { 554 {
563 lazyReattachIfAttached(); 555 lazyReattachIfAttached();
564 } 556 }
565 557
566 bool HTMLPlugInElement::useFallbackContent() const 558 bool HTMLPlugInElement::useFallbackContent() const
567 { 559 {
568 return hasAuthorShadowRoot(); 560 return hasAuthorShadowRoot();
569 } 561 }
570 562
571 } 563 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698