Title: [273170] branches/safari-611-branch/Source/WebKit
- Revision
- 273170
- Author
- alanc...@apple.com
- Date
- 2021-02-19 15:37:37 -0800 (Fri, 19 Feb 2021)
Log Message
Revert r246382. rdar://problem/74501060
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WebKit/ChangeLog (273169 => 273170)
--- branches/safari-611-branch/Source/WebKit/ChangeLog 2021-02-19 23:24:51 UTC (rev 273169)
+++ branches/safari-611-branch/Source/WebKit/ChangeLog 2021-02-19 23:37:37 UTC (rev 273170)
@@ -1,3 +1,7 @@
+2021-02-19 Alan Coon <alanc...@apple.com>
+
+ Revert r246382. rdar://problem/74501060
+
2021-02-17 Alan Coon <alanc...@apple.com>
Cherry-pick r272345. rdar://problem/74195248
Modified: branches/safari-611-branch/Source/WebKit/Shared/SessionState.h (273169 => 273170)
--- branches/safari-611-branch/Source/WebKit/Shared/SessionState.h 2021-02-19 23:24:51 UTC (rev 273169)
+++ branches/safari-611-branch/Source/WebKit/Shared/SessionState.h 2021-02-19 23:37:37 UTC (rev 273170)
@@ -112,10 +112,6 @@
#endif
Vector<FrameState> children;
-
- // This is only used to help debug <rdar://problem/48634553>.
- bool isDestructed { false };
- ~FrameState() { isDestructed = true; }
};
struct PageState {
Modified: branches/safari-611-branch/Source/WebKit/UIProcess/API/C/WKPage.cpp (273169 => 273170)
--- branches/safari-611-branch/Source/WebKit/UIProcess/API/C/WKPage.cpp 2021-02-19 23:24:51 UTC (rev 273169)
+++ branches/safari-611-branch/Source/WebKit/UIProcess/API/C/WKPage.cpp 2021-02-19 23:37:37 UTC (rev 273170)
@@ -491,9 +491,8 @@
return true;
});
- auto data = ""
if (shouldReturnData)
- return toAPI(data.leakRef());
+ return toAPI(encodeLegacySessionState(sessionState).leakRef());
return toAPI(&API::SessionState::create(WTFMove(sessionState)).leakRef());
}
Modified: branches/safari-611-branch/Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp (273169 => 273170)
--- branches/safari-611-branch/Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp 2021-02-19 23:24:51 UTC (rev 273169)
+++ branches/safari-611-branch/Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp 2021-02-19 23:37:37 UTC (rev 273170)
@@ -212,7 +212,6 @@
void encodeFixedLengthData(const uint8_t* data, size_t size, unsigned alignment)
{
- RELEASE_ASSERT(data || !size);
ASSERT(!(reinterpret_cast<uintptr_t>(data) % alignment));
uint8_t* buffer = grow(alignment, size);
@@ -323,9 +322,7 @@
{
encoder << static_cast<uint64_t>(frameState.children.size());
- RELEASE_ASSERT(!frameState.isDestructed);
for (const auto& childFrameState : frameState.children) {
- RELEASE_ASSERT(!childFrameState.isDestructed);
encoder << childFrameState.originalURLString;
encoder << childFrameState.urlString;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
