diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebKit2/UIProcess/qt/QtPageClient.h | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/QtPageClient.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtPageClient.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.h b/Source/WebKit2/UIProcess/qt/QtPageClient.h index fc10ca653..e6d9db307 100644 --- a/Source/WebKit2/UIProcess/qt/QtPageClient.h +++ b/Source/WebKit2/UIProcess/qt/QtPageClient.h @@ -47,7 +47,6 @@ public: virtual WebCore::IntSize viewSize(); virtual bool isViewFocused(); virtual bool isViewVisible(); - virtual void didReceiveMessageFromNavigatorQtObject(const String&); virtual void pageDidRequestScroll(const WebCore::IntPoint&); virtual void didChangeContentsSize(const WebCore::IntSize&); virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&); @@ -61,6 +60,7 @@ public: virtual void handleProxyAuthenticationRequiredRequest(const String& hostname, uint16_t port, const String& prefilledUsername, String& username, String& password); virtual void displayView(); + virtual bool canScrollView() { return false; } virtual void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset); virtual bool isViewWindowActive(); virtual bool isViewInWindow(); @@ -70,6 +70,7 @@ public: virtual void updateAcceleratedCompositingMode(const LayerTreeContext&); #endif // USE(ACCELERATED_COMPOSITING) virtual void pageClosed() { } + virtual void preferencesDidChange() { } virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage); virtual void setCursor(const WebCore::Cursor&); virtual void setCursorHiddenUntilMouseMoves(bool); @@ -89,17 +90,10 @@ public: virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*); virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*); #if ENABLE(INPUT_TYPE_COLOR) - virtual PassRefPtr<WebColorChooserProxy> createColorChooserProxy(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&); + virtual PassRefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&); #endif virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate) { } - virtual void didCommitLoadForMainFrame(bool useCustomRepresentation) { } - virtual void didFinishLoadingDataForCustomRepresentation(const String& suggestedFilename, const CoreIPC::DataReference&) { } - virtual double customRepresentationZoomFactor() { return 1; } - virtual void setCustomRepresentationZoomFactor(double) { } - virtual void didChangeScrollbarsForMainFrame() const { } virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects); - virtual void findStringInCustomRepresentation(const String&, WebKit::FindOptions, unsigned maxMatchCount) { } - virtual void countStringMatchesInCustomRepresentation(const String&, WebKit::FindOptions, unsigned maxMatchCount) { } virtual void pageTransitionViewportReady(); virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&); virtual void updateTextInputState(); |