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

Unified Diff: Source/core/html/HTMLPlugInImageElement.cpp

Issue 34623002: Move the follwing members from HTMLPlugInImageElement to HTMLPlugInElement. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLPlugInImageElement.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLPlugInImageElement.cpp
diff --git a/Source/core/html/HTMLPlugInImageElement.cpp b/Source/core/html/HTMLPlugInImageElement.cpp
index a7b5bbd704928aac972f0bb0ffe5b3ebee5ed44d..3432549051b5a2c7cdf793711ebc0d3fa1a175d4 100644
--- a/Source/core/html/HTMLPlugInImageElement.cpp
+++ b/Source/core/html/HTMLPlugInImageElement.cpp
@@ -31,7 +31,6 @@
#include "core/page/Page.h"
#include "core/page/Settings.h"
#include "platform/Logging.h"
-#include "core/platform/MIMETypeFromURL.h"
#include "core/platform/MIMETypeRegistry.h"
#include "core/platform/graphics/Image.h"
#include "core/plugins/PluginData.h"
@@ -54,13 +53,12 @@ static const float sizingFullPageAreaRatioThreshold = 0.96;
static const float autostartSoonAfterUserGestureThreshold = 5.0;
HTMLPlugInImageElement::HTMLPlugInImageElement(const QualifiedName& tagName, Document& document, bool createdByParser, PreferPlugInsForImagesOption preferPlugInsForImagesOption)
- : HTMLPlugInElement(tagName, document)
+ : HTMLPlugInElement(tagName, document, preferPlugInsForImagesOption)
// m_needsWidgetUpdate(!createdByParser) allows HTMLObjectElement to delay
// widget updates until after all children are parsed. For HTMLEmbedElement
// this delay is unnecessary, but it is simpler to make both classes share
// the same codepath in this class.
, m_needsWidgetUpdate(!createdByParser)
- , m_shouldPreferPlugInsForImages(preferPlugInsForImagesOption == ShouldPreferPlugInsForImages)
, m_createdDuringUserGesture(UserGestureIndicator::processingUserGesture())
{
setHasCustomStyleCallbacks();
@@ -84,19 +82,6 @@ RenderEmbeddedObject* HTMLPlugInImageElement::renderEmbeddedObject() const
return toRenderEmbeddedObject(renderer());
}
-bool HTMLPlugInImageElement::isImageType()
-{
- if (m_serviceType.isEmpty() && protocolIs(m_url, "data"))
- m_serviceType = mimeTypeFromDataURL(m_url);
-
- if (Frame* frame = document().frame()) {
- KURL completedURL = document().completeURL(m_url);
- return frame->loader()->client()->objectContentType(completedURL, m_serviceType, shouldPreferPlugInsForImages()) == ObjectContentImage;
- }
-
- return Image::supportsType(m_serviceType);
-}
-
// We don't use m_url, as it may not be the final URL that the object loads,
// depending on <param> values.
bool HTMLPlugInImageElement::allowedToLoadFrameURL(const String& url)
« no previous file with comments | « Source/core/html/HTMLPlugInImageElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698