Title: [214581] branches/safari-604.1.14-branch
- Revision
- 214581
- Author
- jmarc...@apple.com
- Date
- 2017-03-29 16:42:05 -0700 (Wed, 29 Mar 2017)
Log Message
Cherry-pick r214511. rdar://problem/31260325
Modified Paths
Diff
Modified: branches/safari-604.1.14-branch/Source/_javascript_Core/ChangeLog (214580 => 214581)
--- branches/safari-604.1.14-branch/Source/_javascript_Core/ChangeLog 2017-03-29 23:42:02 UTC (rev 214580)
+++ branches/safari-604.1.14-branch/Source/_javascript_Core/ChangeLog 2017-03-29 23:42:05 UTC (rev 214581)
@@ -1,25 +1,29 @@
2017-03-29 Jason Marcell <jmarc...@apple.com>
- Cherry-pick r214509. rdar://problem/30755345
+ Cherry-pick r214511. rdar://problem/31260325
- 2017-03-28 Mark Lam <mark....@apple.com>
+ 2017-03-29 Jason Marcell <jmarc...@apple.com>
- The Mutator should not be able to steal the conn if the Collector hasn't reached the NotRunning phase yet.
- https://bugs.webkit.org/show_bug.cgi?id=170213
- <rdar://problem/30755345>
+ Cherry-pick r214509. rdar://problem/30755345
- Reviewed by Filip Pizlo.
+ 2017-03-28 Mark Lam <mark....@apple.com>
- The current condition for stealing the conn isn't tight enough. Restricting the
- stealing to when m_currentPhase == NotRunning ensures that the Collector is
- really done running.
+ The Mutator should not be able to steal the conn if the Collector hasn't reached the NotRunning phase yet.
+ https://bugs.webkit.org/show_bug.cgi?id=170213
+ <rdar://problem/30755345>
- No test because this issue only manifests with a race condition that is difficult
- to reproduce on demand.
+ Reviewed by Filip Pizlo.
- * heap/Heap.cpp:
- (JSC::Heap::requestCollection):
+ The current condition for stealing the conn isn't tight enough. Restricting the
+ stealing to when m_currentPhase == NotRunning ensures that the Collector is
+ really done running.
+ No test because this issue only manifests with a race condition that is difficult
+ to reproduce on demand.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::requestCollection):
+
2017-03-29 Jason Marcell <jmarc...@apple.com>
Cherry-pick r214495. rdar://problem/31242019
Modified: branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog (214580 => 214581)
--- branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog 2017-03-29 23:42:02 UTC (rev 214580)
+++ branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog 2017-03-29 23:42:05 UTC (rev 214581)
@@ -1,5 +1,22 @@
2017-03-29 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r214511. rdar://problem/31260325
+
+ 2017-03-28 Timothy Horton <timothy_hor...@apple.com>
+
+ Stop overriding scroll view inset defaults
+ https://bugs.webkit.org/show_bug.cgi?id=170221
+ <rdar://problem/31260325>
+
+ Reviewed by Simon Fraser.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ The default behavior is sufficient for us.
+
+2017-03-29 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r214509. rdar://problem/30755345
2017-03-29 Jason Marcell <jmarc...@apple.com>
Modified: branches/safari-604.1.14-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (214580 => 214581)
--- branches/safari-604.1.14-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-03-29 23:42:02 UTC (rev 214580)
+++ branches/safari-604.1.14-branch/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-03-29 23:42:05 UTC (rev 214581)
@@ -315,7 +315,6 @@
@property (nonatomic) CGFloat verticalScrollDecelerationFactor;
@property (nonatomic, readonly) BOOL _isInterruptingDeceleration;
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
-@property (nonatomic, setter=_setEdgesScrollingContentIntoSafeArea:) UIRectEdge _edgesScrollingContentIntoSafeArea;
@property (nonatomic, readonly) UIEdgeInsets _systemContentInset;
#endif
@end
Modified: branches/safari-604.1.14-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (214580 => 214581)
--- branches/safari-604.1.14-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-03-29 23:42:02 UTC (rev 214580)
+++ branches/safari-604.1.14-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-03-29 23:42:05 UTC (rev 214581)
@@ -508,10 +508,6 @@
[_scrollView setInternalDelegate:self];
[_scrollView setBouncesZoom:YES];
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
- [_scrollView _setEdgesScrollingContentIntoSafeArea:UIRectEdgeAll];
-#endif
-
[self addSubview:_scrollView.get()];
static uint32_t programSDKVersion = dyld_get_program_sdk_version();
Modified: branches/safari-604.1.14-branch/Tools/ChangeLog (214580 => 214581)
--- branches/safari-604.1.14-branch/Tools/ChangeLog 2017-03-29 23:42:02 UTC (rev 214580)
+++ branches/safari-604.1.14-branch/Tools/ChangeLog 2017-03-29 23:42:05 UTC (rev 214581)
@@ -1,20 +1,24 @@
2017-03-29 Jason Marcell <jmarc...@apple.com>
- Cherry-pick r214509. rdar://problem/30755345
+ Cherry-pick r214511. rdar://problem/31260325
- 2017-03-28 Timothy Horton <timothy_hor...@apple.com>
+ 2017-03-29 Jason Marcell <jmarc...@apple.com>
- Safari crashes when attempting to close tab that is displaying PDF
- https://bugs.webkit.org/show_bug.cgi?id=170201
- <rdar://problem/31242019>
+ Cherry-pick r214509. rdar://problem/30755345
- Reviewed by Wenson Hsieh.
+ 2017-03-28 Timothy Horton <timothy_hor...@apple.com>
- * TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm:
- (TEST):
- Add a test for doAfterNextStablePresentationUpdate just like the existing
- non-stable one.
+ Safari crashes when attempting to close tab that is displaying PDF
+ https://bugs.webkit.org/show_bug.cgi?id=170201
+ <rdar://problem/31242019>
+ Reviewed by Wenson Hsieh.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/DoAfterNextPresentationUpdateAfterCrash.mm:
+ (TEST):
+ Add a test for doAfterNextStablePresentationUpdate just like the existing
+ non-stable one.
+
2017-03-22 Matt Rajca <mra...@apple.com>
Only run volume-related autoplay policy tests on Mac.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
