Title: [237247] tags/Safari-607.1.11/Source/WebKitLegacy/mac
- Revision
- 237247
- Author
- bshaf...@apple.com
- Date
- 2018-10-17 21:35:05 -0700 (Wed, 17 Oct 2018)
Log Message
Revert r237137. rdar://problem/45361541
Modified Paths
Diff
Modified: tags/Safari-607.1.11/Source/WebKitLegacy/mac/ChangeLog (237246 => 237247)
--- tags/Safari-607.1.11/Source/WebKitLegacy/mac/ChangeLog 2018-10-18 04:28:05 UTC (rev 237246)
+++ tags/Safari-607.1.11/Source/WebKitLegacy/mac/ChangeLog 2018-10-18 04:35:05 UTC (rev 237247)
@@ -1,3 +1,7 @@
+2018-10-17 Babak Shafiei <bshaf...@apple.com>
+
+ Revert r237137. rdar://problem/45361541
+
2018-10-16 Timothy Hatcher <timo...@apple.com>
Add <meta name="supported-color-schemes"> to control what color schemes the page supports
Modified: tags/Safari-607.1.11/Source/WebKitLegacy/mac/WebView/WebFrame.mm (237246 => 237247)
--- tags/Safari-607.1.11/Source/WebKitLegacy/mac/WebView/WebFrame.mm 2018-10-18 04:28:05 UTC (rev 237246)
+++ tags/Safari-607.1.11/Source/WebKitLegacy/mac/WebView/WebFrame.mm 2018-10-18 04:35:05 UTC (rev 237247)
@@ -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: tags/Safari-607.1.11/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h (237246 => 237247)
--- tags/Safari-607.1.11/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h 2018-10-18 04:28:05 UTC (rev 237246)
+++ tags/Safari-607.1.11/Source/WebKitLegacy/mac/WebView/WebFramePrivate.h 2018-10-18 04:35:05 UTC (rev 237247)
@@ -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
