Move the follwing members from HTMLPlugInImageElement to HTMLPlugInElement.

Source/core/html/HTMLPlugInImageElement.h

 /*
  * Copyright (C) 2008, 2009, 2011, 2012 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 22 matching lines @@
 class FrameLoader;
 class Image;
 class MouseEvent;
 class Widget;
 
 enum PluginCreationOption {
     CreateAnyWidgetType,
     CreateOnlyNonNetscapePlugins,
 };
 
-enum PreferPlugInsForImagesOption {
-    ShouldPreferPlugInsForImages,
-    ShouldNotPreferPlugInsForImages
-};
-
 // Base class for HTMLObjectElement and HTMLEmbedElement
 class HTMLPlugInImageElement : public HTMLPlugInElement {
 public:
     virtual ~HTMLPlugInImageElement();
 
     RenderEmbeddedObject* renderEmbeddedObject() const;
 
     virtual void setDisplayState(DisplayState) OVERRIDE;
 
     virtual void updateWidget(PluginCreationOption) = 0;
 
     const String& serviceType() const { return m_serviceType; }
     const String& url() const { return m_url; }
     const KURL& loadedUrl() const { return m_loadedUrl; }
 
     const String loadedMimeType() const
     {
         String mimeType = serviceType();
         if (mimeType.isEmpty())
             mimeType = mimeTypeFromURL(m_loadedUrl);
         return mimeType;
     }
 
-    bool shouldPreferPlugInsForImages() const { return m_shouldPreferPlugInsForImages; }
-
     // Public for FrameView::addWidgetToUpdate()
     bool needsWidgetUpdate() const { return m_needsWidgetUpdate; }
     void setNeedsWidgetUpdate(bool needsWidgetUpdate) { m_needsWidgetUpdate = needsWidgetUpdate; }
 
 protected:
     HTMLPlugInImageElement(const QualifiedName& tagName, Document&, bool createdByParser, PreferPlugInsForImagesOption);
 
-    bool isImageType();
-
     OwnPtr<HTMLImageLoader> m_imageLoader;
-    String m_serviceType;
-    String m_url;
     KURL m_loadedUrl;
 
     static void updateWidgetCallback(Node*);
     virtual void attach(const AttachContext& = AttachContext()) OVERRIDE;
     virtual void detach(const AttachContext& = AttachContext()) OVERRIDE;
 
     bool allowedToLoadFrameURL(const String& url);
     bool wouldLoadAsNetscapePlugin(const String& url, const String& serviceType);
 
     virtual void didMoveToNewDocument(Document& oldDocument) OVERRIDE;
@@ skipping 12 matching lines @@
     void swapRendererTimerFired(Timer<HTMLPlugInImageElement>*);
 
     void restartSimilarPlugIns();
 
     bool loadPlugin(const KURL&, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);
     bool pluginIsLoadable(const KURL&, const String& mimeType);
 
     virtual bool isPlugInImageElement() const OVERRIDE { return true; }
 
     bool m_needsWidgetUpdate;
-    bool m_shouldPreferPlugInsForImages;
     bool m_createdDuringUserGesture;
 };
 
 inline HTMLPlugInImageElement* toHTMLPlugInImageElement(Node* node)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isPluginElement());
     HTMLPlugInElement* plugInElement = static_cast<HTMLPlugInElement*>(node);
     ASSERT_WITH_SECURITY_IMPLICATION(plugInElement->isPlugInImageElement());
     return static_cast<HTMLPlugInImageElement*>(plugInElement);
 }
 
 inline const HTMLPlugInImageElement* toHTMLPlugInImageElement(const Node* node)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isPluginElement());
     const HTMLPlugInElement* plugInElement = static_cast<const HTMLPlugInElement*>(node);
     ASSERT_WITH_SECURITY_IMPLICATION(plugInElement->isPlugInImageElement());
     return static_cast<const HTMLPlugInImageElement*>(plugInElement);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toHTMLPlugInImageElement(const HTMLPlugInImageElement*);
 
 } // namespace WebCore
 
 #endif // HTMLPlugInImageElement_h