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

Unified Diff: Source/WebCore/plugins/PluginView.h

Issue 13544008: Remove PlatformWidget references (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/plugins/PluginView.h
diff --git a/Source/WebCore/plugins/PluginView.h b/Source/WebCore/plugins/PluginView.h
index 7e76040c308eecd3b4bf1c8345015909ddf2a681..1c7564db76549217e824f4f597489bf00d41fb6d 100644
--- a/Source/WebCore/plugins/PluginView.h
+++ b/Source/WebCore/plugins/PluginView.h
@@ -47,42 +47,6 @@
#include "npruntime_internal.h"
#endif
-#if OS(WINDOWS) && (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(WX))
-typedef struct HWND__* HWND;
-typedef HWND PlatformPluginWidget;
-#else
-typedef PlatformWidget PlatformPluginWidget;
-#if defined(XP_MACOSX) && PLATFORM(QT)
-#include <QPixmap>
-#endif
-#endif
-#if PLATFORM(QT)
-#if USE(TEXTURE_MAPPER)
-#include "TextureMapperPlatformLayer.h"
-#endif
-
-#include <QImage>
-QT_BEGIN_NAMESPACE
-class QPainter;
-QT_END_NAMESPACE
-#endif
-#if PLATFORM(QT) && USE(ACCELERATED_COMPOSITING) && ENABLE(NETSCAPE_PLUGIN_API) && defined(XP_UNIX)
-#ifndef WTF_USE_ACCELERATED_COMPOSITING_PLUGIN_LAYER
-#define WTF_USE_ACCELERATED_COMPOSITING_PLUGIN_LAYER 1
-#endif
-#endif
-#if PLATFORM(GTK)
-typedef struct _GtkSocket GtkSocket;
-#endif
-
-#if USE(JSC)
-namespace JSC {
- namespace Bindings {
- class Instance;
- }
-}
-#endif
-
namespace WebCore {
class Frame;
class Image;
@@ -393,19 +357,6 @@ namespace WebCore {
bool m_haveUpdatedPluginWidget;
#endif
-#if ((PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(WX)) && OS(WINDOWS)) || defined(XP_MACOSX) || PLATFORM(EFL)
- // On Mac OSX and Qt/Windows the plugin does not have its own native widget,
- // but is using the containing window as its reference for positioning/painting.
- PlatformPluginWidget m_window;
-public:
- PlatformPluginWidget platformPluginWidget() const { return m_window; }
- void setPlatformPluginWidget(PlatformPluginWidget widget) { m_window = widget; }
-#else
-public:
- void setPlatformPluginWidget(PlatformPluginWidget widget) { setPlatformWidget(widget); }
- PlatformPluginWidget platformPluginWidget() const { return platformWidget(); }
-#endif
-
private:
#if defined(XP_UNIX) || PLATFORM(GTK)
@@ -443,7 +394,6 @@ private:
static bool s_isRunningUnderDRT;
static void setXKeyEventSpecificFields(XEvent*, KeyboardEvent*);
void paintUsingXPixmap(QPainter* painter, const QRect &exposedRect);
- QWebPageClient* platformPageClient() const;
#endif
#if USE(ACCELERATED_COMPOSITING_PLUGIN_LAYER)
OwnPtr<PlatformLayer> m_platformLayer;

Powered by Google App Engine
This is Rietveld 408576698