diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-18 10:55:06 +0200 |
| commit | ee4c86d1990a9e26277a6948e7027ad8d525ebfa (patch) | |
| tree | 1e2d3408cd097606571f40ab63353c27bcb7dd5c /Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp | |
| parent | d882bec96d0d30aeeda2141bfadfca7f038ee862 (diff) | |
| download | qtwebkit-ee4c86d1990a9e26277a6948e7027ad8d525ebfa.tar.gz | |
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
Diffstat (limited to 'Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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<uint64_t>(0)); } CoreIPC::DataReference EncoderAdapter::dataReference() const |