diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
| commit | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (patch) | |
| tree | b7abd9f49ae1d4d2e426a5883bfccd42b8e2ee12 /Source/WebKit2/WebProcess/WebPage/WebPage.h | |
| parent | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (diff) | |
| download | qtwebkit-a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd.tar.gz | |
Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/WebPage.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/WebPage.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h index d18c401bf..4b2b76c8c 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.h +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h @@ -306,10 +306,10 @@ public: void exitAcceleratedCompositingMode(); #endif -#if PLATFORM(MAC) void addPluginView(PluginView*); void removePluginView(PluginView*); +#if PLATFORM(MAC) LayerHostingMode layerHostingMode() const { return m_layerHostingMode; } void setLayerHostingMode(LayerHostingMode); @@ -454,6 +454,8 @@ public: void replaceSelectionWithText(WebCore::Frame*, const String&); void clearSelection(); + +#if ENABLE(DRAG_SUPPORT) #if PLATFORM(WIN) void performDragControllerAction(uint64_t action, WebCore::IntPoint clientPosition, WebCore::IntPoint globalPosition, uint64_t draggingSourceOperationMask, const WebCore::DragDataMap&, uint32_t flags); #elif PLATFORM(QT) || PLATFORM(GTK) @@ -465,6 +467,7 @@ public: void willPerformLoadDragDestinationAction(); void mayPerformUploadDragDestinationAction(); +#endif // ENABLE(DRAG_SUPPORT) void beginPrinting(uint64_t frameID, const PrintInfo&); void endPrinting(); @@ -704,6 +707,9 @@ private: WebCore::IntSize m_viewSize; OwnPtr<DrawingArea> m_drawingArea; + + HashSet<PluginView*> m_pluginViews; + bool m_useFixedLayout; bool m_drawsBackground; @@ -730,9 +736,6 @@ private: // The accessibility position of the view. WebCore::IntPoint m_accessibilityPosition; - // All plug-in views on this web page. - HashSet<PluginView*> m_pluginViews; - // The layer hosting mode. LayerHostingMode m_layerHostingMode; |