diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-28 16:39:37 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:01 +0000 |
| commit | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (patch) | |
| tree | 322337ad0acbc75732f916376ec6d36e7ec0e5bc /Source/WebKit2/UIProcess/WebPageProxy.h | |
| parent | 6882a04fb36642862b11efe514251d32070c3d65 (diff) | |
Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess/WebPageProxy.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebPageProxy.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h index 8c9bad74d..fb39d86f4 100644 --- a/Source/WebKit2/UIProcess/WebPageProxy.h +++ b/Source/WebKit2/UIProcess/WebPageProxy.h @@ -110,6 +110,7 @@ OBJC_CLASS _WKRemoteObjectRegistry; #endif #if PLATFORM(QT) +#include "ArgumentCodersQt.h" #include "QtNetworkRequestData.h" #endif @@ -865,7 +866,6 @@ public: bool isValid() const; const String& urlAtProcessExit() const { return m_urlAtProcessExit; } - FrameLoadState::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; } #if ENABLE(DRAG_SUPPORT) WebCore::DragOperation currentDragOperation() const { return m_currentDragOperation; } @@ -1147,8 +1147,8 @@ private: virtual void failedToShowPopupMenu() override; #endif #if PLATFORM(QT) - virtual void changeSelectedIndex(int32_t newSelectedIndex); - virtual void closePopupMenu(); + void changeSelectedIndex(int32_t newSelectedIndex) override; + void closePopupMenu() override; #endif void didCreateMainFrame(uint64_t frameID); @@ -1631,7 +1631,6 @@ private: String m_toolTip; String m_urlAtProcessExit; - FrameLoadState::LoadState m_loadStateAtProcessExit; EditorState m_editorState; bool m_isEditable; |