Unreviewed, rolling out r237137.

SPI is actually used

Reverted changeset:

"Remove unused WebFrame._loadType"
https://bugs.webkit.org/show_bug.cgi?id=190583
https://trac.webkit.org/changeset/237137

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

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
index e47e9ee..5297370 100644 (file)
--- a/Source/WebKitLegacy/mac/ChangeLog
+++ b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,3 +1,15 @@
+2018-10-18  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed, rolling out r237137.
+
+        SPI is actually used
+
+        Reverted changeset:
+
+        "Remove unused WebFrame._loadType"
+        https://bugs.webkit.org/show_bug.cgi?id=190583
+        https://trac.webkit.org/changeset/237137
+
 2018-10-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Enable the datalist element by default on iOS and macOS

diff --git a/Source/WebKitLegacy/mac/WebView/WebFrame.mm b/Source/WebKitLegacy/mac/WebView/WebFrame.mm
index 588e299..7262ce2 100644 (file)
--- a/Source/WebKitLegacy/mac/WebView/WebFrame.mm
+++ b/Source/WebKitLegacy/mac/WebView/WebFrame.mm
@@ -1061,6 +1061,38 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
     return NO;
 }
 
+static WebFrameLoadType toWebFrameLoadType(FrameLoadType frameLoadType)
+{
+    switch (frameLoadType) {
+    case FrameLoadType::Standard:
+        return WebFrameLoadTypeStandard;
+    case FrameLoadType::Back:
+        return WebFrameLoadTypeBack;
+    case FrameLoadType::Forward:
+        return WebFrameLoadTypeForward;
+    case FrameLoadType::IndexedBackForward:
+        return WebFrameLoadTypeIndexedBackForward;
+    case FrameLoadType::Reload:
+        return WebFrameLoadTypeReload;
+    case FrameLoadType::Same:
+        return WebFrameLoadTypeSame;
+    case FrameLoadType::RedirectWithLockedBackForwardList:
+        return WebFrameLoadTypeInternal;
+    case FrameLoadType::Replace:
+        return WebFrameLoadTypeReplace;
+    case FrameLoadType::ReloadFromOrigin:
+        return WebFrameLoadTypeReloadFromOrigin;
+    case FrameLoadType::ReloadExpiredOnly:
+        ASSERT_NOT_REACHED();
+        return WebFrameLoadTypeReload;
+    }
+}
+
+- (WebFrameLoadType)_loadType
+{
+    return toWebFrameLoadType(_private->coreFrame->loader().loadType());
+}
+
 #if PLATFORM(IOS)
 - (BOOL)needsLayout
 {

diff --git a/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h b/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h
index f9ae8fa..6a938c2 100644 (file)
--- a/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h
+++ b/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h
@@ -67,6 +67,19 @@ extern NSString *WebFrameUsesGeolocation;
 extern NSString *WebFrameUsesApplicationCache;
 extern NSString *WebFrameCanSuspendActiveDOMObjects;
 
+typedef enum {
+    WebFrameLoadTypeStandard,
+    WebFrameLoadTypeBack,
+    WebFrameLoadTypeForward,
+    WebFrameLoadTypeIndexedBackForward, // a multi-item hop in the backforward list
+    WebFrameLoadTypeReload,
+    WebFrameLoadTypeReloadAllowingStaleData,
+    WebFrameLoadTypeSame,               // user loads same URL again (but not reload button)
+    WebFrameLoadTypeInternal,           // maps to WebCore::FrameLoadTypeRedirectWithLockedBackForwardList
+    WebFrameLoadTypeReplace,
+    WebFrameLoadTypeReloadFromOrigin,
+} WebFrameLoadType;
+
 @interface WebFrame (WebPrivate)
 
 - (BOOL)_isDescendantOfFrame:(WebFrame *)frame;
@@ -79,6 +92,7 @@ extern NSString *WebFrameCanSuspendActiveDOMObjects;
 - (BOOL)_isFrameSet;
 - (BOOL)_firstLayoutDone;
 - (BOOL)_isVisuallyNonEmpty;
+- (WebFrameLoadType)_loadType;
 #if TARGET_OS_IPHONE
 - (BOOL)needsLayout; // Needed for Mail <rdar://problem/6228038>
 - (void)_setLoadsSynchronously:(BOOL)flag;