From ee4c86d1990a9e26277a6948e7027ad8d525ebfa Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 18 Oct 2012 10:55:06 +0200 Subject: Imported WebKit commit 795dcd25a9649fccaf1c9b685f6e2ffedaf7e620 (http://svn.webkit.org/repository/webkit/trunk@131718) New snapshot that includes the return of -fkeep-memory at link time to reduce memory pressure as well as modularized documentation --- Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp') diff --git a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp index bda7d9b72..54f9372d1 100644 --- a/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp +++ b/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp @@ -33,8 +33,11 @@ namespace WebKit { EncoderAdapter::EncoderAdapter() - : m_encoder(CoreIPC::ArgumentEncoder::create(0)) + : m_encoder(CoreIPC::ArgumentEncoder::create()) { + // Keep format compatibility by decoding an unused uint64_t value + // that used to be encoded by the argument encoder. + m_encoder->encode(static_cast(0)); } CoreIPC::DataReference EncoderAdapter::dataReference() const -- cgit v1.2.1