Title: [258177] branches/safari-610.1.7-branch/Source/WebKit
- Revision
- 258177
- Author
- [email protected]
- Date
- 2020-03-09 16:51:43 -0700 (Mon, 09 Mar 2020)
Log Message
Cherry-pick r258168. rdar://problem/60249994
[iOS] Only map UTI from tags in Safari
https://bugs.webkit.org/show_bug.cgi?id=208829
<rdar://problem/60234672>
Reviewed by Tim Horton.
Since this mapping caused regressions in other apps, only enable it for Safari as a temporary workaround.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258168 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.7-branch/Source/WebKit/ChangeLog (258176 => 258177)
--- branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-09 23:49:27 UTC (rev 258176)
+++ branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-09 23:51:43 UTC (rev 258177)
@@ -1,3 +1,39 @@
+2020-03-09 Alan Coon <[email protected]>
+
+ Cherry-pick r258168. rdar://problem/60249994
+
+ [iOS] Only map UTI from tags in Safari
+ https://bugs.webkit.org/show_bug.cgi?id=208829
+ <rdar://problem/60234672>
+
+ Reviewed by Tim Horton.
+
+ Since this mapping caused regressions in other apps, only enable it for Safari as a temporary workaround.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258168 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-09 Per Arne Vollan <[email protected]>
+
+ [iOS] Only map UTI from tags in Safari
+ https://bugs.webkit.org/show_bug.cgi?id=208829
+ <rdar://problem/60234672>
+
+ Reviewed by Tim Horton.
+
+ Since this mapping caused regressions in other apps, only enable it for Safari as a temporary workaround.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2020-03-08 Brent Fulgham <[email protected]>
Revise In-App Browser Privacy checks to better reflect the meaning of the flag
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (258176 => 258177)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-03-09 23:49:27 UTC (rev 258176)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-03-09 23:51:43 UTC (rev 258177)
@@ -432,7 +432,8 @@
parameters.focusRingColor = RenderTheme::singleton().focusRingColor(OptionSet<StyleColor::Options>());
parameters.localizedDeviceModel = localizedDeviceModel();
#if USE(UTTYPE_SWIZZLER)
- parameters.vectorOfUTTypeItem = createVectorOfUTTypeItem();
+ if (WebCore::IOSApplication::isMobileSafari())
+ parameters.vectorOfUTTypeItem = createVectorOfUTTypeItem();
#endif
#endif
Modified: branches/safari-610.1.7-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (258176 => 258177)
--- branches/safari-610.1.7-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-03-09 23:49:27 UTC (rev 258176)
+++ branches/safari-610.1.7-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm 2020-03-09 23:51:43 UTC (rev 258177)
@@ -299,8 +299,10 @@
#endif
#if USE(UTTYPE_SWIZZLER)
- swizzleUTTypeRecord();
- setVectorOfUTTypeItem(WTFMove(parameters.vectorOfUTTypeItem));
+ if (!parameters.vectorOfUTTypeItem.isEmpty()) {
+ swizzleUTTypeRecord();
+ setVectorOfUTTypeItem(WTFMove(parameters.vectorOfUTTypeItem));
+ }
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
