Title: [241506] branches/safari-607-branch/Source/WebKit
- Revision
- 241506
- Author
- [email protected]
- Date
- 2019-02-14 00:34:31 -0800 (Thu, 14 Feb 2019)
Log Message
Cherry-pick r241453. rdar://problem/48065612
Fix -Wformat warning from r241401
https://bugs.webkit.org/show_bug.cgi?id=194584
<rdar://problem/47761293>
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setActivityState):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241453 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (241505 => 241506)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-02-14 08:34:29 UTC (rev 241505)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-02-14 08:34:31 UTC (rev 241506)
@@ -1,5 +1,27 @@
2019-02-13 Babak Shafiei <[email protected]>
+ Cherry-pick r241453. rdar://problem/48065612
+
+ Fix -Wformat warning from r241401
+ https://bugs.webkit.org/show_bug.cgi?id=194584
+ <rdar://problem/47761293>
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setActivityState):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@241453 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-02-13 Michael Catanzaro <[email protected]>
+
+ Fix -Wformat warning from r241401
+ https://bugs.webkit.org/show_bug.cgi?id=194584
+ <rdar://problem/47761293>
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setActivityState):
+
+2019-02-13 Babak Shafiei <[email protected]>
+
Cherry-pick r241448. rdar://problem/48065637
Crash in WebKit::CacheStorage::Engine::cachesRootPath
Modified: branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (241505 => 241506)
--- branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-02-14 08:34:29 UTC (rev 241505)
+++ branches/safari-607-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-02-14 08:34:31 UTC (rev 241506)
@@ -3010,7 +3010,7 @@
if (changed)
updateThrottleState();
- ASSERT_WITH_MESSAGE(m_page, "setActivityState called on %lld but WebCore page was null", pageID());
+ ASSERT_WITH_MESSAGE(m_page, "setActivityState called on %" PRIu64 " 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
