Title: [171091] trunk/Source/WebKit2
- Revision
- 171091
- Author
- ander...@apple.com
- Date
- 2014-07-14 16:35:47 -0700 (Mon, 14 Jul 2014)
Log Message
Use the legacy session coder for encoding/decoding session state
https://bugs.webkit.org/show_bug.cgi?id=134910
Reviewed by Beth Dakin.
* UIProcess/Cocoa/SessionStateCoding.mm:
(WebKit::encodeSessionState):
(WebKit::decodeSessionState):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171090 => 171091)
--- trunk/Source/WebKit2/ChangeLog 2014-07-14 23:13:56 UTC (rev 171090)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-14 23:35:47 UTC (rev 171091)
@@ -1,3 +1,14 @@
+2014-07-14 Anders Carlsson <ander...@apple.com>
+
+ Use the legacy session coder for encoding/decoding session state
+ https://bugs.webkit.org/show_bug.cgi?id=134910
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/Cocoa/SessionStateCoding.mm:
+ (WebKit::encodeSessionState):
+ (WebKit::decodeSessionState):
+
2014-07-14 Oliver Hunt <oli...@apple.com>
Restrict network process to remote connections
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.mm (171090 => 171091)
--- trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.mm 2014-07-14 23:13:56 UTC (rev 171090)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/SessionStateCoding.mm 2014-07-14 23:35:47 UTC (rev 171091)
@@ -23,21 +23,22 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
-#include "SessionStateCoding.h"
+#import "config.h"
+#import "SessionStateCoding.h"
+#import "LegacySessionStateCoding.h"
+#import "WKNSData.h"
+
namespace WebKit {
-RetainPtr<NSData> encodeSessionState(const SessionState&)
+RetainPtr<NSData> encodeSessionState(const SessionState& sessionState)
{
- // FIXME: Implement.
- return nullptr;
+ return [wrapper(*WebKit::encodeLegacySessionState(sessionState).release().leakRef()) autorelease];
}
-bool decodeSessionState(NSData *, SessionState&)
+bool decodeSessionState(NSData *data, SessionState& state)
{
- // FIXME: Implement.
- return false;
+ return decodeLegacySessionState(static_cast<const uint8_t*>(data.bytes), data.length, state);
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
