Title: [237260] trunk/Source/WebKitLegacy/mac
- Revision
- 237260
- Author
- achristen...@apple.com
- Date
- 2018-10-18 10:33:53 -0700 (Thu, 18 Oct 2018)
Log 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
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (237259 => 237260)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-18 17:31:21 UTC (rev 237259)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-18 17:33:53 UTC (rev 237260)
@@ -1,3 +1,15 @@
+2018-10-18 Alex Christensen <achristen...@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_hs...@apple.com>
Enable the datalist element by default on iOS and macOS
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm (237259 => 237260)
--- trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm 2018-10-18 17:31:21 UTC (rev 237259)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFrame.mm 2018-10-18 17:33:53 UTC (rev 237260)
@@ -1061,6 +1061,38 @@
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
{
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h (237259 => 237260)
--- trunk/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h 2018-10-18 17:31:21 UTC (rev 237259)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h 2018-10-18 17:33:53 UTC (rev 237260)
@@ -67,6 +67,19 @@
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 @@
- (BOOL)_isFrameSet;
- (BOOL)_firstLayoutDone;
- (BOOL)_isVisuallyNonEmpty;
+- (WebFrameLoadType)_loadType;
#if TARGET_OS_IPHONE
- (BOOL)needsLayout; // Needed for Mail <rdar://problem/6228038>
- (void)_setLoadsSynchronously:(BOOL)flag;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
