Commit 4567e4f4 authored by aroben@apple.com's avatar aroben@apple.com

Move progress-related methods to WebFrameLoaderClient

         Reviewed by Anders.

         * WebCoreSupport/WebFrameLoaderClient.cpp:
         (WebFrameLoaderClient::postProgressStartedNotification):
         (WebFrameLoaderClient::postProgressEstimateChangedNotification):
         (WebFrameLoaderClient::postProgressFinishedNotification):
         * WebCoreSupport/WebFrameLoaderClient.h:
         * WebFrame.cpp:
         * WebFrame.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@30580 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a8f4a38f
2008-02-25 Adam Roben <aroben@apple.com>
Move progress-related methods to WebFrameLoaderClient
Reviewed by Anders.
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::postProgressStartedNotification):
(WebFrameLoaderClient::postProgressEstimateChangedNotification):
(WebFrameLoaderClient::postProgressFinishedNotification):
* WebCoreSupport/WebFrameLoaderClient.h:
* WebFrame.cpp:
* WebFrame.h:
2008-02-25 Adam Roben <aroben@apple.com>
Remove WebFrame::detachedFromParent1
......
......@@ -32,6 +32,7 @@
#include "MarshallingHelpers.h"
#include "WebDocumentLoader.h"
#include "WebFrame.h"
#include "WebNotificationCenter.h"
#include "WebView.h"
#pragma warning(push, 0)
#include <WebCore/DocumentLoader.h>
......@@ -173,6 +174,27 @@ void WebFrameLoaderClient::dispatchShow()
ui->webViewShow(webView);
}
void WebFrameLoaderClient::postProgressStartedNotification()
{
static BSTR progressStartedName = SysAllocString(WebViewProgressStartedNotification);
IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
notifyCenter->postNotificationName(progressStartedName, static_cast<IWebView*>(m_webFrame->webView()), 0);
}
void WebFrameLoaderClient::postProgressEstimateChangedNotification()
{
static BSTR progressEstimateChangedName = SysAllocString(WebViewProgressEstimateChangedNotification);
IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
notifyCenter->postNotificationName(progressEstimateChangedName, static_cast<IWebView*>(m_webFrame->webView()), 0);
}
void WebFrameLoaderClient::postProgressFinishedNotification()
{
static BSTR progressFinishedName = SysAllocString(WebViewProgressFinishedNotification);
IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
notifyCenter->postNotificationName(progressFinishedName, static_cast<IWebView*>(m_webFrame->webView()), 0);
}
PassRefPtr<DocumentLoader> WebFrameLoaderClient::createDocumentLoader(const ResourceRequest& request, const SubstituteData& substituteData)
{
RefPtr<WebDocumentLoader> loader = new WebDocumentLoader(request, substituteData);
......
......@@ -54,6 +54,11 @@ public:
virtual void dispatchDidFinishLoad();
virtual void dispatchDidFirstLayout();
virtual void dispatchShow();
virtual void postProgressStartedNotification();
virtual void postProgressEstimateChangedNotification();
virtual void postProgressFinishedNotification();
virtual PassRefPtr<WebCore::DocumentLoader> createDocumentLoader(const WebCore::ResourceRequest&, const WebCore::SubstituteData&);
protected:
......
......@@ -1830,27 +1830,6 @@ Frame* WebFrame::dispatchCreatePage()
return 0;
}
void WebFrame::postProgressStartedNotification()
{
static BSTR progressStartedName = SysAllocString(WebViewProgressStartedNotification);
IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
notifyCenter->postNotificationName(progressStartedName, static_cast<IWebView*>(d->webView), 0);
}
void WebFrame::postProgressEstimateChangedNotification()
{
static BSTR progressEstimateChangedName = SysAllocString(WebViewProgressEstimateChangedNotification);
IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
notifyCenter->postNotificationName(progressEstimateChangedName, static_cast<IWebView*>(d->webView), 0);
}
void WebFrame::postProgressFinishedNotification()
{
static BSTR progressFinishedName = SysAllocString(WebViewProgressFinishedNotification);
IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
notifyCenter->postNotificationName(progressFinishedName, static_cast<IWebView*>(d->webView), 0);
}
void WebFrame::startDownload(const ResourceRequest&)
{
notImplemented();
......
......@@ -287,10 +287,6 @@ public:
virtual void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&);
virtual void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&);
virtual void postProgressStartedNotification();
virtual void postProgressEstimateChangedNotification();
virtual void postProgressFinishedNotification();
virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::KURL& url, const WebCore::String& name, WebCore::HTMLFrameOwnerElement* ownerElement,
const WebCore::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
virtual WebCore::Widget* createPlugin(const WebCore::IntSize&, WebCore::Element*, const WebCore::KURL&, const Vector<WebCore::String>&, const Vector<WebCore::String>&, const WebCore::String&, bool loadManually);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment