Title: [241503] branches/safari-607-branch/Source/WebKit
- Revision
- 241503
- Author
- [email protected]
- Date
- 2019-02-14 00:34:24 -0800 (Thu, 14 Feb 2019)
Log Message
Cherry-pick r241401. rdar://problem/48065612
Crash in Page::setActivityState because m_page is null
https://bugs.webkit.org/show_bug.cgi?id=194584
Reviewed by Antti Koivisto.
Add a null check to avoid the crash. Also add a debug assertion to help diagnose this in the future.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setActivityState):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241401 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (241502 => 241503)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-02-14 08:34:21 UTC (rev 241502)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-02-14 08:34:24 UTC (rev 241503)
@@ -1,5 +1,34 @@
2019-02-13 Babak Shafiei <[email protected]>
+ Cherry-pick r241401. rdar://problem/48065612
+
+ Crash in Page::setActivityState because m_page is null
+ https://bugs.webkit.org/show_bug.cgi?id=194584
+
+ Reviewed by Antti Koivisto.
+
+ Add a null check to avoid the crash. Also add a debug assertion to help diagnose this in the future.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setActivityState):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241401 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-02-13 Ryosuke Niwa <[email protected]>
+
+ Crash in Page::setActivityState because m_page is null
+ https://bugs.webkit.org/show_bug.cgi?id=194584
+
+ Reviewed by Antti Koivisto.
+
+ Add a null check to avoid the crash. Also add a debug assertion to help diagnose this in the future.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setActivityState):
+
+2019-02-13 Babak Shafiei <[email protected]>
+
Cherry-pick r241349. rdar://problem/48065639
Null deref in userInterfaceLayoutDirection under ViewGestureController::handleSwipeGesture
Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (241502 => 241503)
--- branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-02-14 08:34:21 UTC (rev 241502)
+++ branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-02-14 08:34:24 UTC (rev 241503)
@@ -3010,7 +3010,8 @@
if (changed)
updateThrottleState();
- {
+ ASSERT_WITH_MESSAGE(m_page, "setActivityState called on %lld but WebCore page was null", pageID());
+ if (m_page) {
SetForScope<bool> currentlyChangingActivityState { m_changingActivityState, true };
m_page->setActivityState(activityState);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
