Changeset 220429 in webkit
- Timestamp:
- Aug 8, 2017 4:53:04 PM (7 years ago)
- Location:
- trunk/Source/WebKitLegacy/mac
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKitLegacy/mac/ChangeLog
r220370 r220429 1 2017-08-08 Brady Eidson <beidson@apple.com> 2 3 Don't enable default icon loading in WK1 for apps linked against old SDKs. 4 <rdar://problem/33724060> and https://bugs.webkit.org/show_bug.cgi?id=175342 5 6 Reviewed by Andy Estes. 7 8 * Misc/WebKitVersionChecks.h: 9 * WebCoreSupport/WebFrameLoaderClient.mm: 10 (WebFrameLoaderClient::getLoadDecisionForIcons): Don't do any icon loading unless 11 the app is linked against new WebKit with the new behavior. 12 1 13 2017-08-07 Devin Rousso <drousso@apple.com> 2 14 -
trunk/Source/WebKitLegacy/mac/Misc/WebKitVersionChecks.h
r219283 r220429 62 62 #define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 0x02190100 // 537.1.0 63 63 #define WEBKIT_FIRST_VERSION_WITH_INSECURE_CONTENT_BLOCKING 0x02590116 // 601.1.22 64 #define WEBKIT_FIRST_VERSION_WITH_DEFAULT_ICON_LOADING 0x025C0126 // 604.1.38 65 64 66 #else 65 67 // <rdar://problem/6627758> Need to implement WebKitLinkedOnOrAfter -
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
r219743 r220429 55 55 #import "WebKitLogging.h" 56 56 #import "WebKitNSStringExtras.h" 57 #import "WebKitVersionChecks.h" 57 58 #import "WebNSURLExtras.h" 58 59 #import "WebNavigationData.h" … … 143 144 #import <WebCore/WAKWindow.h> 144 145 #import <WebCore/WebCoreThreadMessage.h> 145 #import "WebKitVersionChecks.h"146 146 #import "WebMailDelegate.h" 147 147 #import "WebUIKitDelegate.h" … … 2281 2281 ASSERT(documentLoader); 2282 2282 2283 #if PLATFORM(MAC) 2284 if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_DEFAULT_ICON_LOADING)) { 2285 for (auto& icon : icons) 2286 documentLoader->didGetLoadDecisionForIcon(false, icon.second, 0); 2287 2288 return; 2289 } 2290 #endif 2291 2283 2292 bool disallowedDueToImageLoadSettings = false; 2284 2293 if (!frame->settings().loadsImagesAutomatically() && !frame->settings().loadsSiteIconsIgnoringImageLoadingSetting())
Note: See TracChangeset
for help on using the changeset viewer.