diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit/chromium/src/ChromeClientImpl.h | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit/chromium/src/ChromeClientImpl.h')
| -rw-r--r-- | Source/WebKit/chromium/src/ChromeClientImpl.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.h b/Source/WebKit/chromium/src/ChromeClientImpl.h index 4a609dadd..77084f801 100644 --- a/Source/WebKit/chromium/src/ChromeClientImpl.h +++ b/Source/WebKit/chromium/src/ChromeClientImpl.h @@ -60,10 +60,11 @@ class WebColorChooser; class WebColorChooserClient; class WebViewImpl; struct WebCursorInfo; +struct WebScreenInfo; struct WebPopupMenuInfo; // Handles window-level notifications from WebCore on behalf of a WebView. -class ChromeClientImpl : public WebCore::ChromeClientChromium { +class ChromeClientImpl : public WebCore::ChromeClientChromium, public WebCore::PageClientChromium { public: explicit ChromeClientImpl(WebViewImpl* webView); virtual ~ChromeClientImpl(); @@ -123,7 +124,7 @@ public: const WebCore::IntRect& clipRect); virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const; virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) const; - virtual PlatformPageClient platformPageClient() const { return 0; } + virtual PlatformPageClient platformPageClient() const { return PlatformPageClient(this); } virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&) const; virtual void layoutUpdated(WebCore::Frame*) const; virtual void scrollRectIntoView( @@ -146,8 +147,8 @@ public: virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE; PassOwnPtr<WebColorChooser> createWebColorChooser(WebColorChooserClient*, const WebColor&); #endif -#if ENABLE(CALENDAR_PICKER) - virtual PassOwnPtr<WebCore::DateTimeChooser> openDateTimeChooser(WebCore::DateTimeChooserClient*, const WebCore::DateTimeChooserParameters&) OVERRIDE; +#if ENABLE(DATE_AND_TIME_INPUT_TYPES) + virtual PassRefPtr<WebCore::DateTimeChooser> openDateTimeChooser(WebCore::DateTimeChooserClient*, const WebCore::DateTimeChooserParameters&) OVERRIDE; #endif virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>); virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*); @@ -194,6 +195,9 @@ public: virtual void popupClosed(WebCore::PopupContainer* popupContainer); virtual void postAccessibilityNotification(WebCore::AccessibilityObject*, WebCore::AXObjectCache::AXNotification); + // PageClientChromium methods: + virtual WebScreenInfo screenInfo(); + // ChromeClientImpl: void setCursorForPlugin(const WebCursorInfo&); void setNewWindowNavigationPolicy(WebNavigationPolicy); |