Reviewed by Maciej.

        - fixed "Stop and reload don't work on the WebView"
        http://bugs.webkit.org/show_bug.cgi?id=11285

        * COM/WebFrame.cpp:
        (WebFrame::stopLoading): Implement.
        * COM/WebView.cpp:
        (WebView::stopLoading): ditto
        (WebView::reload): ditto

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17482 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/COM/WebFrame.cpp b/WebKit/COM/WebFrame.cpp
index 5c5f99f1d2f272233cf71472ed1ff0cb6cac75d7..7b0530f199f46783bc636377bfba222c727e9ae2 100644 (file)
--- a/WebKit/COM/WebFrame.cpp
+++ b/WebKit/COM/WebFrame.cpp
@@ -276,7 +276,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::provisionalDataSource(
 
 HRESULT STDMETHODCALLTYPE WebFrame::stopLoading( void)
 {
-//    DebugBreak();
+    d->frame->stopLoading(false);
     return E_NOTIMPL;
 }
 

diff --git a/WebKit/COM/WebView.cpp b/WebKit/COM/WebView.cpp
index 5df05f2efe61829809b4d67e929a3d644ba6ea8b..64f2670edc4299ddc3c5f145cad2c923cde30853 100644 (file)
--- a/WebKit/COM/WebView.cpp
+++ b/WebKit/COM/WebView.cpp
@@ -832,14 +832,16 @@ HRESULT STDMETHODCALLTYPE WebView::takeStringURLFrom(
 HRESULT STDMETHODCALLTYPE WebView::stopLoading( 
         /* [in] */ IUnknown* /*sender*/)
 {
-    DebugBreak();
+    if (m_mainFrame)
+        m_mainFrame->stopLoading();
     return E_NOTIMPL;
 }
     
 HRESULT STDMETHODCALLTYPE WebView::reload( 
         /* [in] */ IUnknown* /*sender*/)
 {
-    DebugBreak();
+    if (m_mainFrame)
+        m_mainFrame->reload();
     return E_NOTIMPL;
 }
     

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 13894e61de0ac85cfedadfdaca71453d78c48a0b..d66372e6d0896fff98b6da38ae07a507a65dd7e3 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2006-10-31  Marvin Decker  <marv.decker@gmail.com>
+
+        Reviewed by Maciej.
+        
+        - fixed "Stop and reload don't work on the WebView"
+        http://bugs.webkit.org/show_bug.cgi?id=11285
+
+        * COM/WebFrame.cpp:
+        (WebFrame::stopLoading): Implement.
+        * COM/WebView.cpp:
+        (WebView::stopLoading): ditto
+        (WebView::reload): ditto
+
 2006-10-30  Darin Adler  <darin@apple.com>
 
         * Plugins/WebBaseNetscapePluginView.mm: