From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Oct 2012 16:21:14 +0200 Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes --- Source/WebCore/html/HTMLPlugInElement.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/html/HTMLPlugInElement.h') diff --git a/Source/WebCore/html/HTMLPlugInElement.h b/Source/WebCore/html/HTMLPlugInElement.h index eeec60cb5..d7bcb166e 100644 --- a/Source/WebCore/html/HTMLPlugInElement.h +++ b/Source/WebCore/html/HTMLPlugInElement.h @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2006, 2007, 2008, 2009, 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 @@ -24,6 +24,7 @@ #define HTMLPlugInElement_h #include "HTMLFrameOwnerElement.h" +#include "Image.h" #include "ImageLoaderClient.h" #include "ScriptInstance.h" @@ -37,7 +38,7 @@ class RenderEmbeddedObject; class RenderWidget; class Widget; -class HTMLPlugInElement : public HTMLFrameOwnerElement, public ImageLoaderClientBase { +class HTMLPlugInElement : public HTMLFrameOwnerElement { public: virtual ~HTMLPlugInElement(); @@ -47,6 +48,15 @@ public: Widget* pluginWidget() const; + enum DisplayState { + WaitingForSnapshot, + DisplayingSnapshot, + Playing + }; + DisplayState displayState() const { return m_displayState; } + void setDisplayState(DisplayState state) { m_displayState = state; } + virtual void updateSnapshot(PassRefPtr) { } + #if ENABLE(NETSCAPE_PLUGIN_API) NPObject* getNPObject(); #endif @@ -84,6 +94,8 @@ private: NPObject* m_NPObject; #endif bool m_isCapturingMouseEvents; + + DisplayState m_displayState; }; } // namespace WebCore -- cgit v1.2.1