Title: [242219] branches/safari-607.1.40.1-branch/Source/WebCore
- Revision
- 242219
- Author
- [email protected]
- Date
- 2019-02-28 13:24:47 -0800 (Thu, 28 Feb 2019)
Log Message
Apply patch. rdar://problem/48464969
Modified Paths
Diff
Modified: branches/safari-607.1.40.1-branch/Source/WebCore/ChangeLog (242218 => 242219)
--- branches/safari-607.1.40.1-branch/Source/WebCore/ChangeLog 2019-02-28 21:19:25 UTC (rev 242218)
+++ branches/safari-607.1.40.1-branch/Source/WebCore/ChangeLog 2019-02-28 21:24:47 UTC (rev 242219)
@@ -1,3 +1,18 @@
+2019-02-28 Alan Coon <[email protected]>
+
+ Apply patch. rdar://problem/48464969
+
+ 2019-02-28 Timothy Hatcher <[email protected]>
+
+ REGRESSION: WebKit content crash in Base System (because NSAppearance is NULL).
+ https://bugs.webkit.org/show_bug.cgi?id=195086
+ rdar://problem/48419124
+
+ Reviewed by Tim Horton.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (-[WebScrollerImpDelegate effectiveAppearanceForScrollerImp:]): Always return a valid NSAppearance.
+
2019-02-24 Babak Shafiei <[email protected]>
Cherry-pick r241986. rdar://problem/48350373
Modified: branches/safari-607.1.40.1-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (242218 => 242219)
--- branches/safari-607.1.40.1-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2019-02-28 21:19:25 UTC (rev 242218)
+++ branches/safari-607.1.40.1-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2019-02-28 21:24:47 UTC (rev 242219)
@@ -538,7 +538,9 @@
// If dark appearance is used or the overlay style is light (because of a dark page background), return the dark apppearance.
// Keep this in sync with FrameView::paintScrollCorner.
bool useDarkAppearance = _scrollbar->scrollableArea().useDarkAppearance() || _scrollbar->scrollableArea().scrollbarOverlayStyle() == WebCore::ScrollbarOverlayStyleLight;
- return [NSAppearance appearanceNamed:useDarkAppearance ? NSAppearanceNameDarkAqua : NSAppearanceNameAqua];
+ if (auto *appearance = [NSAppearance appearanceNamed:useDarkAppearance ? NSAppearanceNameDarkAqua : NSAppearanceNameAqua])
+ return appearance;
+ return [NSAppearance currentAppearance];
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
