Modified: trunk/Source/WebKit2/ChangeLog (191102 => 191103)
--- trunk/Source/WebKit2/ChangeLog 2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-15 08:18:58 UTC (rev 191103)
@@ -1,5 +1,22 @@
2015-10-15 Carlos Garcia Campos <cgar...@igalia.com>
+ [GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
+ https://bugs.webkit.org/show_bug.cgi?id=84960
+
+ Reviewed by Žan Doberšek.
+
+ Add a cross-platform implementation to LegacySessionStateCodingNone
+ using the new SessionState, so that non mac ports can make unit
+ tests that use the legacy session state coding pass.
+
+ * UIProcess/LegacySessionStateCodingNone.cpp:
+ (WebKit::encodeLegacySessionState):
+ (WebKit::decodeLegacySessionState):
+ (WebKit::encodeLegacySessionHistoryEntryData): Deleted.
+ (WebKit::decodeLegacySessionHistoryEntryData): Deleted.
+
+2015-10-15 Carlos Garcia Campos <cgar...@igalia.com>
+
Unreviewed. Fix wrong #ifdef added in r190615.
This disabled accelerated compositing unconditionally.
Modified: trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp (191102 => 191103)
--- trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp 2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Source/WebKit2/UIProcess/LegacySessionStateCodingNone.cpp 2015-10-15 08:18:58 UTC (rev 191103)
@@ -27,33 +27,32 @@
#include "LegacySessionStateCoding.h"
#include "APIData.h"
+#include "ArgumentDecoder.h"
+#include "ArgumentEncoder.h"
#include "SessionState.h"
-#include <WebCore/NotImplemented.h>
+#include "WebCoreArgumentCoders.h"
namespace WebKit {
-RefPtr<API::Data> encodeLegacySessionState(const SessionState&)
+RefPtr<API::Data> encodeLegacySessionState(const SessionState& sessionState)
{
- notImplemented();
- return API::Data::create(nullptr, 0);
+ IPC::ArgumentEncoder encoder;
+ encoder << sessionState.backForwardListState;
+ encoder << sessionState.renderTreeSize;
+ encoder << sessionState.provisionalURL;
+ return API::Data::create(encoder.buffer(), encoder.bufferSize());
}
-RefPtr<API::Data> encodeLegacySessionHistoryEntryData(const FrameState&)
+bool decodeLegacySessionState(const uint8_t* data, size_t dataSize, SessionState& sessionState)
{
- notImplemented();
- return API::Data::create(nullptr, 0);
+ IPC::ArgumentDecoder decoder(data, dataSize);
+ if (!decoder.decode(sessionState.backForwardListState))
+ return false;
+ if (!decoder.decode(sessionState.renderTreeSize))
+ return false;
+ if (!decoder.decode(sessionState.provisionalURL))
+ return false;
+ return true;
}
-bool decodeLegacySessionState(const uint8_t*, size_t, SessionState&)
-{
- notImplemented();
- return false;
-}
-
-bool decodeLegacySessionHistoryEntryData(const uint8_t*, size_t, FrameState&)
-{
- notImplemented();
- return false;
-}
-
} // namespace WebKit
Modified: trunk/Tools/ChangeLog (191102 => 191103)
--- trunk/Tools/ChangeLog 2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Tools/ChangeLog 2015-10-15 08:18:58 UTC (rev 191103)
@@ -1,3 +1,15 @@
+2015-10-15 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] Test WebKit2.RestoreSessionStateContainingFormData fails
+ https://bugs.webkit.org/show_bug.cgi?id=84960
+
+ Reviewed by Žan Doberšek.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner): Unskip tests using SessionState.
+ * TestWebKitAPI/PlatformGTK.cmake: Add
+ WKPageCopySessionStateWithFiltering test.
+
2015-10-14 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Missing return value on TestWebExtensions.cpp:193
Modified: trunk/Tools/Scripts/run-gtk-tests (191102 => 191103)
--- trunk/Tools/Scripts/run-gtk-tests 2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Tools/Scripts/run-gtk-tests 2015-10-15 08:18:58 UTC (rev 191103)
@@ -68,10 +68,8 @@
SkippedTest("WebKit2/TestWebKit2", "WebKit2.MouseMoveAfterCrash", "Test is flaky", 85066),
SkippedTest("WebKit2/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutForImages", "Test is flaky", 85066),
SkippedTest("WebKit2/TestWebKit2", "WebKit2.NewFirstVisuallyNonEmptyLayoutFrames", "Test fails", 85037),
- SkippedTest("WebKit2/TestWebKit2", "WebKit2.RestoreSessionStateContainingFormData", "Session State is not implemented in GTK+ port", 84960),
SkippedTest("WebKit2/TestWebKit2", "WebKit2.SpacebarScrolling", "Test fails", 84961),
SkippedTest("WebKit2/TestWebKit2", "WebKit2.WKConnection", "Tests fail and time out out", 84959),
- SkippedTest("WebKit2/TestWebKit2", "WebKit2.WKPageGetScaleFactorNotZero", "Test fails and times out", 88455),
SkippedTest("WebKit2/TestWebKit2", "WebKit2.ForceRepaint", "Test times out", 105532),
SkippedTest("WebKit2/TestWebKit2", "WebKit2.ReloadPageAfterCrash", "Test flakily times out", 110129),
SkippedTest("WebKit2/TestWebKit2", "WebKit2.DidAssociateFormControls", "Test times out", 120302),
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (191102 => 191103)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2015-10-15 08:16:53 UTC (rev 191102)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2015-10-15 08:18:58 UTC (rev 191103)
@@ -108,6 +108,7 @@
${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMedia.cpp
${TESTWEBKITAPI_DIR}/Tests/WebKit2/UserMessage.cpp
${TESTWEBKITAPI_DIR}/Tests/WebKit2/WillSendSubmitEvent.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageCopySessionStateWithFiltering.cpp
${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp
${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKPreferences.cpp
${TESTWEBKITAPI_DIR}/Tests/WebKit2/WKRetainPtr.cpp
