From 2bde8e466a4451c7319e3a072d118917957d6554 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 25 May 2011 19:08:45 +0100 Subject: Merge WebKit at r82507: Initial merge by git Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e --- Source/WebCore/html/HTMLPlugInImageElement.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/html/HTMLPlugInImageElement.h') diff --git a/Source/WebCore/html/HTMLPlugInImageElement.h b/Source/WebCore/html/HTMLPlugInImageElement.h index 364262b..c27c0f8 100644 --- a/Source/WebCore/html/HTMLPlugInImageElement.h +++ b/Source/WebCore/html/HTMLPlugInImageElement.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -33,6 +33,11 @@ enum PluginCreationOption { CreateAnyWidgetType, CreateOnlyNonNetscapePlugins, }; + +enum PreferPlugInsForImagesOption { + ShouldPreferPlugInsForImages, + ShouldNotPreferPlugInsForImages +}; // Base class for HTMLObjectElement and HTMLEmbedElement class HTMLPlugInImageElement : public HTMLPlugInElement { @@ -43,9 +48,10 @@ public: const String& serviceType() const { return m_serviceType; } const String& url() const { return m_url; } + bool shouldPreferPlugInsForImages() const { return m_shouldPreferPlugInsForImages; } protected: - HTMLPlugInImageElement(const QualifiedName& tagName, Document*, bool createdByParser); + HTMLPlugInImageElement(const QualifiedName& tagName, Document*, bool createdByParser, PreferPlugInsForImagesOption); bool isImageType(); @@ -75,6 +81,7 @@ private: virtual bool useFallbackContent() const { return false; } bool m_needsWidgetUpdate; + bool m_shouldPreferPlugInsForImages; }; } // namespace WebCore -- cgit v1.1