diff options
Diffstat (limited to 'WebKit/haiku')
-rw-r--r-- | WebKit/haiku/ChangeLog | 40 | ||||
-rw-r--r-- | WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp | 3 | ||||
-rw-r--r-- | WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h | 2 | ||||
-rw-r--r-- | WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp | 10 | ||||
-rw-r--r-- | WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h | 5 |
5 files changed, 56 insertions, 4 deletions
diff --git a/WebKit/haiku/ChangeLog b/WebKit/haiku/ChangeLog index d55ce71..7ed4fad 100644 --- a/WebKit/haiku/ChangeLog +++ b/WebKit/haiku/ChangeLog @@ -1,3 +1,43 @@ +2010-10-29 Alexey Proskuryakov <ap@apple.com> + + Reviewed by Darin Adler. + + https://bugs.webkit.org/show_bug.cgi?id=48576 + Let WebKit2 client know when a frame is a frameset + + Added a blank implementation of the new FrameLoaderClient method. + + * WebCoreSupport/FrameLoaderClientHaiku.h: + * WebCoreSupport/FrameLoaderClientHaiku.cpp: + (WebCore::FrameLoaderClientHaiku::dispatchDidBecomeFrameset): + +2010-10-26 Jenn Braithwaite <jennb@chromium.org> + + Reviewed by Dmitry Titov. + + Resource tracking failure when trying to move a frame between documents + https://bugs.webkit.org/show_bug.cgi?id=44713 + + * WebCoreSupport/FrameLoaderClientHaiku.cpp: + (WebCore::FrameLoaderClientHaiku::transferLoadingResourceFromPage): + Empty method. + * WebCoreSupport/FrameLoaderClientHaiku.h: + +2010-10-22 Sam Weinig <sam@webkit.org> + + Reviewed by Anders Carlsson. + + WebKit2 needs to pass the current event modifier flags when requesting a new window + https://bugs.webkit.org/show_bug.cgi?id=48140 + + * WebCoreSupport/ChromeClientHaiku.cpp: + (WebCore::ChromeClientHaiku::createWindow): + * WebCoreSupport/ChromeClientHaiku.h: + * WebCoreSupport/FrameLoaderClientHaiku.cpp: + (WebCore::FrameLoaderClientHaiku::dispatchCreatePage): + * WebCoreSupport/FrameLoaderClientHaiku.h: + Add NavigationAction parameter. + 2010-09-28 Jenn Braithwaite <jennb@chromium.org> Reviewed by Dmitry Titov. diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp index 6c54424..134cabe 100644 --- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.cpp @@ -34,6 +34,7 @@ #include "FrameView.h" #include "HitTestResult.h" #include "Icon.h" +#include "NavigationAction.h" #include "NotImplemented.h" #include "PlatformString.h" #include "SecurityOrigin.h" @@ -107,7 +108,7 @@ void ChromeClientHaiku::focusedNodeChanged(Node*) { } -Page* ChromeClientHaiku::createWindow(Frame*, const FrameLoadRequest&, const WebCore::WindowFeatures&) +Page* ChromeClientHaiku::createWindow(Frame*, const FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) { notImplemented(); return 0; diff --git a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h index 6a5b381..9409c69 100644 --- a/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h +++ b/WebKit/haiku/WebCoreSupport/ChromeClientHaiku.h @@ -60,7 +60,7 @@ namespace WebCore { void focusedNodeChanged(Node*); - Page* createWindow(Frame*, const FrameLoadRequest&, const WebCore::WindowFeatures&); + Page* createWindow(Frame*, const FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&); Page* createModalDialog(Frame*, const FrameLoadRequest&); void show(); diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp index cae0ed1..74625c5 100644 --- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp +++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp @@ -645,7 +645,7 @@ void FrameLoaderClientHaiku::dispatchDidFailLoad(const ResourceError&) notImplemented(); } -Frame* FrameLoaderClientHaiku::dispatchCreatePage() +Frame* FrameLoaderClientHaiku::dispatchCreatePage(const WebCore::NavigationAction&) { notImplemented(); return false; @@ -745,6 +745,10 @@ void FrameLoaderClientHaiku::didTransferChildFrameToNewDocument(Page*) { } +void FrameLoaderClientHaiku::transferLoadingResourceFromPage(unsigned long, DocumentLoader*, const ResourceRequest&, Page*) +{ +} + ObjectContentType FrameLoaderClientHaiku::objectContentType(const KURL& url, const String& mimeType) { notImplemented(); @@ -853,4 +857,8 @@ void FrameLoaderClientHaiku::transitionToCommittedForNewPage() m_frame->view()->setScrollbarModes(owner->scrollingMode(), owner->scrollingMode()); } +void FrameLoaderClientHaiku::dispatchDidBecomeFrameset(bool) +{ +} + } // namespace WebCore diff --git a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h index 1701cb0..dcdb1a0 100644 --- a/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h +++ b/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h @@ -151,6 +151,8 @@ namespace WebCore { virtual void transitionToCommittedFromCachedFrame(WebCore::CachedFrame*); virtual void transitionToCommittedForNewPage(); + virtual void dispatchDidBecomeFrameset(bool); + virtual void updateGlobalHistory(); virtual void updateGlobalHistoryRedirectLinks(); virtual bool shouldGoToHistoryItem(HistoryItem*) const; @@ -199,7 +201,7 @@ namespace WebCore { virtual void dispatchDidFailProvisionalLoad(const ResourceError&); virtual void dispatchDidFailLoad(const ResourceError&); - virtual Frame* dispatchCreatePage(); + virtual Frame* dispatchCreatePage(const NavigationAction&); virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String&, const ResourceRequest&); @@ -222,6 +224,7 @@ namespace WebCore { HTMLFrameOwnerElement*, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight); virtual void didTransferChildFrameToNewDocument(WebCore::Page*); + virtual void transferLoadingResourceFromPage(unsigned long, WebCore::DocumentLoader*, const ResourceRequest&, WebCore::Page*); virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually); |