diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebKit/haiku/WebCoreSupport | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebKit/haiku/WebCoreSupport')
| -rw-r--r-- | WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp | 2 | ||||
| -rw-r--r-- | WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h | 3 | ||||
| -rw-r--r-- | WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp index 8932da1..4820d78 100644 --- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp @@ -271,7 +271,7 @@ IntRect ChromeClientHaiku::windowToScreen(const IntRect&) const return IntRect(); } -PlatformWidget ChromeClientHaiku::platformWindow() const +PlatformPageClient ChromeClientHaiku::platformPageClient() const { notImplemented(); return PlatformWidget(); diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h index 386c380..a6f57eb 100644 --- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h +++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h @@ -104,7 +104,7 @@ namespace WebCore { void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect); IntPoint screenToWindow(const IntPoint&) const; IntRect windowToScreen(const IntRect&) const; - PlatformWidget platformWindow() const; + PlatformPageClient platformPageClient() const; void contentsSizeChanged(Frame*, const IntSize&) const; void scrollRectIntoView(const IntRect&, const ScrollView*) const; @@ -112,6 +112,7 @@ namespace WebCore { void scrollBackingStore(int, int, const IntRect&, const IntRect&); void updateBackingStore(); + void scrollbarsModeDidChange() const { } void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags); void setToolTip(const String&); diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp index d2683c0..a8ba16f 100644 --- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp @@ -280,7 +280,7 @@ void FrameLoaderClientHaiku::dispatchWillSubmitForm(FramePolicyFunction function // FIXME: Send an event to allow for alerts and cancellation. if (!m_frame) return; - (m_frame->loader()->*function)(PolicyUse); + (m_frame->loader()->policyChecker()->*function)(PolicyUse); } void FrameLoaderClientHaiku::dispatchDidLoadMainResource(DocumentLoader*) @@ -635,7 +635,7 @@ void FrameLoaderClientHaiku::dispatchDecidePolicyForMIMEType(FramePolicyFunction return; notImplemented(); - (m_frame->loader()->*function)(PolicyUse); + (m_frame->loader()->policyChecker()->*function)(PolicyUse); } void FrameLoaderClientHaiku::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, @@ -650,12 +650,12 @@ void FrameLoaderClientHaiku::dispatchDecidePolicyForNewWindowAction(FramePolicyF BMessage message(NEW_WINDOW_REQUESTED); message.AddString("url", request.url().string()); if (m_messenger->SendMessage(&message)) { - (m_frame->loader()->*function)(PolicyIgnore); + (m_frame->loader()->policyChecker()->*function)(PolicyIgnore); return; } } - (m_frame->loader()->*function)(PolicyUse); + (m_frame->loader()->policyChecker()->*function)(PolicyUse); } void FrameLoaderClientHaiku::dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, @@ -671,7 +671,7 @@ void FrameLoaderClientHaiku::dispatchDecidePolicyForNavigationAction(FramePolicy message.AddString("url", request.url().string()); m_messenger->SendMessage(&message); - (m_frame->loader()->*function)(PolicyUse); + (m_frame->loader()->policyChecker()->*function)(PolicyUse); } } |