diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:23:55 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-04-27 17:07:03 +0100 |
| commit | 692e5dbf12901edacf14812a6fae25462920af42 (patch) | |
| tree | d62802373a429e0a9dc093b6046c166b2c514285 /WebKit/haiku/WebCoreSupport | |
| parent | e24bea4efef1c414137d36a9778aa4e142e10c7d (diff) | |
| download | external_webkit-692e5dbf12901edacf14812a6fae25462920af42.zip external_webkit-692e5dbf12901edacf14812a6fae25462920af42.tar.gz external_webkit-692e5dbf12901edacf14812a6fae25462920af42.tar.bz2 | |
Merge webkit.org at r55033 : Initial merge by git
Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
Diffstat (limited to 'WebKit/haiku/WebCoreSupport')
4 files changed, 11 insertions, 0 deletions
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp index 24f0b52..a7f1145 100644 --- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp @@ -346,6 +346,11 @@ void ChromeClientHaiku::runOpenPanel(Frame*, PassRefPtr<FileChooser>) notImplemented(); } +void ChromeClientHaiku::iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>) +{ + notImplemented(); +} + bool ChromeClientHaiku::setCursor(PlatformCursorHandle) { notImplemented(); diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h index ecd66de..3b0841b 100644 --- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h +++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h @@ -134,6 +134,7 @@ namespace WebCore { void requestGeolocationPermissionForFrame(Frame*, Geolocation*); void runOpenPanel(Frame*, PassRefPtr<FileChooser>); + void iconForFiles(const Vector<String>&, PassRefPtr<FileChooser>); bool setCursor(PlatformCursorHandle); diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp index 3a84c4f..77c7cfc 100644 --- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp @@ -745,6 +745,10 @@ PassRefPtr<Frame> FrameLoaderClientHaiku::createFrame(const KURL& url, const Str return 0; } +void FrameLoaderClientHaiku::didTransferChildFrameToNewDocument() +{ +} + ObjectContentType FrameLoaderClientHaiku::objectContentType(const KURL& url, const String& mimeType) { notImplemented(); diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h index 2ffde8f..dadda19 100644 --- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h +++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h @@ -220,6 +220,7 @@ namespace WebCore { virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement*, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); + virtual void didTransferChildFrameToNewDocument(); virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually); |