Reviewed by Darin.
authormjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Oct 2006 22:24:18 +0000 (22:24 +0000)
committermjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 8 Oct 2006 22:24:18 +0000 (22:24 +0000)
        - split didNotOpenURL: into general and page-cache-specific parts

        * bridge/mac/WebCoreFrameBridge.h:
        * bridge/mac/WebCoreFrameBridge.mm:
        (-[WebCoreFrameBridge didNotOpenURL:]):
        (-[WebCoreFrameBridge invalidatePageCache:]):

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

WebCore/ChangeLog
WebCore/bridge/mac/WebCoreFrameBridge.h
WebCore/bridge/mac/WebCoreFrameBridge.mm

index 93b1c03c1d47e8a67ad151b8a981b7d98aadbc10..18fa5836bb5fd60ecd69846bc45a85b86bd523d2 100644 (file)
@@ -1,3 +1,14 @@
+2006-10-08  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+        - split didNotOpenURL: into general and page-cache-specific parts
+
+        * bridge/mac/WebCoreFrameBridge.h:
+        * bridge/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge didNotOpenURL:]):
+        (-[WebCoreFrameBridge invalidatePageCache:]):
+
 2006-10-08  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Darin.
index 52749e3c0b3a71460e95a331cb23204724420fe8..e08bfd309a37bdcd49dc6376fd81b3e9b7252ae6 100644 (file)
@@ -229,7 +229,8 @@ typedef enum {
 - (void)closeURL;
 - (void)stopLoading;
 
-- (void)didNotOpenURL:(NSURL *)URL pageCache:(NSDictionary *)pageCache;
+- (void)didNotOpenURL:(NSURL *)URL;
+- (void)invalidatePageCache:(NSDictionary *)pageCache;
 
 - (BOOL)canLoadURL:(NSURL *)URL fromReferrer:(NSString *)referrer hideReferrer:(BOOL *)hideReferrer;
 - (BOOL)canTargetLoadInFrame:(WebCoreFrameBridge *)targetFrame;
index e9bbd826b2bea1f9f6ab79ce7e07db14295f5863..c870cbb946473a70cbcace05c17724af76258cce 100644 (file)
@@ -596,10 +596,13 @@ static inline WebCoreFrameBridge *bridge(Frame *frame)
     m_frame->stopLoading();
 }
 
-- (void)didNotOpenURL:(NSURL *)URL pageCache:(NSDictionary *)pageCache
+- (void)didNotOpenURL:(NSURL *)URL
 {
     m_frame->didNotOpenURL(KURL(URL).url());
+}
 
+- (void)invalidatePageCache:(NSDictionary *)pageCache
+{
     // We might have made a page cache item, but now we're bailing out due to an error before we ever
     // transitioned to the new page (before WebFrameState==commit).  The goal here is to restore any state
     // so that the existing view (that wenever got far enough to replace) can continue being used.