Changeset 220439 in webkit

Timestamp:

Aug 8, 2017 8:18:25 PM (7 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r220429. rdar://problem/33789343

Location:

branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• Misc/WebKitVersionChecks.h (modified) (1 diff)
• WebCoreSupport/WebFrameLoaderClient.mm (modified) (3 diffs)

branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2017-08-08  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r220429. rdar://problem/33789343
+
+    2017-08-08  Brady Eidson  <beidson@apple.com>
+
+            Don't enable default icon loading in WK1 for apps linked against old SDKs.
+            <rdar://problem/33724060> and https://bugs.webkit.org/show_bug.cgi?id=175342
+
+            Reviewed by Andy Estes.
+
+            * Misc/WebKitVersionChecks.h:
+            * WebCoreSupport/WebFrameLoaderClient.mm:
+            (WebFrameLoaderClient::getLoadDecisionForIcons): Don't do any icon loading unless
+              the app is linked against new WebKit with the new behavior.
+
 2017-07-26  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac/Misc/WebKitVersionChecks.h

@@ -62 +62 @@
 #define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 0x02190100 // 537.1.0
 #define WEBKIT_FIRST_VERSION_WITH_INSECURE_CONTENT_BLOCKING 0x02590116 // 601.1.22
+#define WEBKIT_FIRST_VERSION_WITH_DEFAULT_ICON_LOADING 0x025C0126 // 604.1.38
+
 #else
 // <rdar://problem/6627758> Need to implement WebKitLinkedOnOrAfter

branches/safari-604.1.38.1-branch/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -56 +56 @@
 #import "WebKitLogging.h"
 #import "WebKitNSStringExtras.h"
+#import "WebKitVersionChecks.h"
 #import "WebNSURLExtras.h"
 #import "WebNavigationData.h"
@@ -145 +146 @@
 #import <WebCore/WAKWindow.h>
 #import <WebCore/WebCoreThreadMessage.h>
-#import "WebKitVersionChecks.h"
 #import "WebMailDelegate.h"
 #import "WebUIKitDelegate.h"
@@ -2283 +2283 @@
     ASSERT(documentLoader);
 
+#if PLATFORM(MAC)
+    if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_DEFAULT_ICON_LOADING)) {
+        for (auto& icon : icons)
+            documentLoader->didGetLoadDecisionForIcon(false, icon.second, 0);
+
+        return;
+    }
+#endif
+
     bool disallowedDueToImageLoadSettings = false;
     if (!frame->settings().loadsImagesAutomatically() && !frame->settings().loadsSiteIconsIgnoringImageLoadingSetting())