Changeset 237260 in webkit


Ignore:
Timestamp:
Oct 18, 2018, 10:33:53 AM (7 years ago)
Author:
achristensen@apple.com
Message:

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

Location:
trunk/Source/WebKitLegacy/mac
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r237245 r237260  
     12018-10-18  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r237137.
     4
     5        SPI is actually used
     6
     7        Reverted changeset:
     8
     9        "Remove unused WebFrame._loadType"
     10        https://bugs.webkit.org/show_bug.cgi?id=190583
     11        https://trac.webkit.org/changeset/237137
     12
    1132018-10-17  Wenson Hsieh  <wenson_hsieh@apple.com>
    214

  • trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm

    r237137 r237260  
    10621062}
    10631063
     1064static WebFrameLoadType toWebFrameLoadType(FrameLoadType frameLoadType)
     1065{
     1066    switch (frameLoadType) {
     1067    case FrameLoadType::Standard:
     1068        return WebFrameLoadTypeStandard;
     1069    case FrameLoadType::Back:
     1070        return WebFrameLoadTypeBack;
     1071    case FrameLoadType::Forward:
     1072        return WebFrameLoadTypeForward;
     1073    case FrameLoadType::IndexedBackForward:
     1074        return WebFrameLoadTypeIndexedBackForward;
     1075    case FrameLoadType::Reload:
     1076        return WebFrameLoadTypeReload;
     1077    case FrameLoadType::Same:
     1078        return WebFrameLoadTypeSame;
     1079    case FrameLoadType::RedirectWithLockedBackForwardList:
     1080        return WebFrameLoadTypeInternal;
     1081    case FrameLoadType::Replace:
     1082        return WebFrameLoadTypeReplace;
     1083    case FrameLoadType::ReloadFromOrigin:
     1084        return WebFrameLoadTypeReloadFromOrigin;
     1085    case FrameLoadType::ReloadExpiredOnly:
     1086        ASSERT_NOT_REACHED();
     1087        return WebFrameLoadTypeReload;
     1088    }
     1089}
     1090
     1091- (WebFrameLoadType)_loadType
     1092{
     1093    return toWebFrameLoadType(_private->coreFrame->loader().loadType());
     1094}
     1095
    10641096#if PLATFORM(IOS)
    10651097- (BOOL)needsLayout

  • trunk/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h

    r237137 r237260  
    6868extern NSString *WebFrameCanSuspendActiveDOMObjects;
    6969
     70typedef enum {
     71    WebFrameLoadTypeStandard,
     72    WebFrameLoadTypeBack,
     73    WebFrameLoadTypeForward,
     74    WebFrameLoadTypeIndexedBackForward, // a multi-item hop in the backforward list
     75    WebFrameLoadTypeReload,
     76    WebFrameLoadTypeReloadAllowingStaleData,
     77    WebFrameLoadTypeSame,               // user loads same URL again (but not reload button)
     78    WebFrameLoadTypeInternal,           // maps to WebCore::FrameLoadTypeRedirectWithLockedBackForwardList
     79    WebFrameLoadTypeReplace,
     80    WebFrameLoadTypeReloadFromOrigin,
     81} WebFrameLoadType;
     82
    7083@interface WebFrame (WebPrivate)
    7184
    … …  
    8093- (BOOL)_firstLayoutDone;
    8194- (BOOL)_isVisuallyNonEmpty;
     95- (WebFrameLoadType)_loadType;
    8296#if TARGET_OS_IPHONE
    8397- (BOOL)needsLayout; // Needed for Mail <rdar://problem/6228038>
Note: See TracChangeset for help on using the changeset viewer.