<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170756] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170756">170756</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-07-03 10:09:42 -0700 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of DecoderAdapter and EncoderAdapter
https://bugs.webkit.org/show_bug.cgi?id=134598
Reviewed by Andreas Kling.
* CMakeLists.txt:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/DecoderAdapter.cpp: Removed.
* WebProcess/WebPage/DecoderAdapter.h: Removed.
* WebProcess/WebPage/EncoderAdapter.cpp: Removed.
* WebProcess/WebPage/EncoderAdapter.h: Removed.
* WebProcess/WebPage/WebPage.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDecoderAdaptercpp">trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDecoderAdapterh">trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEncoderAdaptercpp">trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEncoderAdapterh">trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (170755 => 170756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2014-07-03 17:05:41 UTC (rev 170755)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-07-03 17:09:42 UTC (rev 170756)
</span><span class="lines">@@ -543,9 +543,7 @@
</span><span class="cx"> WebProcess/WebCoreSupport/WebSearchPopupMenu.cpp
</span><span class="cx"> WebProcess/WebCoreSupport/WebVibrationClient.cpp
</span><span class="cx">
</span><del>- WebProcess/WebPage/DecoderAdapter.cpp
</del><span class="cx"> WebProcess/WebPage/DrawingArea.cpp
</span><del>- WebProcess/WebPage/EncoderAdapter.cpp
</del><span class="cx"> WebProcess/WebPage/EventDispatcher.cpp
</span><span class="cx"> WebProcess/WebPage/FindController.cpp
</span><span class="cx"> WebProcess/WebPage/LayerTreeHost.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170755 => 170756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-03 17:05:41 UTC (rev 170755)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-03 17:09:42 UTC (rev 170756)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-03 Anders Carlsson <andersca@apple.com>
+
+ Get rid of DecoderAdapter and EncoderAdapter
+ https://bugs.webkit.org/show_bug.cgi?id=134598
+
+ Reviewed by Andreas Kling.
+
+ * CMakeLists.txt:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/DecoderAdapter.cpp: Removed.
+ * WebProcess/WebPage/DecoderAdapter.h: Removed.
+ * WebProcess/WebPage/EncoderAdapter.cpp: Removed.
+ * WebProcess/WebPage/EncoderAdapter.h: Removed.
+ * WebProcess/WebPage/WebPage.cpp:
+
</ins><span class="cx"> 2014-07-02 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop using EncoderAdapter/DecoderAdapter for FormData
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (170755 => 170756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-03 17:05:41 UTC (rev 170755)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-03 17:09:42 UTC (rev 170756)
</span><span class="lines">@@ -1077,10 +1077,6 @@
</span><span class="cx"> 9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 9391F283121B38F500EBF7E8 /* WebFrameNetworkingContext.h */; };
</span><span class="cx"> 939AE7661316E99C00AE06A6 /* WebCoreArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */; };
</span><span class="cx"> 93BDEB01171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 93BDEB00171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 93FC67BD12D3CCF200A60610 /* DecoderAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93FC679D12D3CC7400A60610 /* DecoderAdapter.cpp */; };
- 93FC67BE12D3CCF200A60610 /* DecoderAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FC679E12D3CC7400A60610 /* DecoderAdapter.h */; };
- 93FC67BF12D3CCF200A60610 /* EncoderAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93FC679F12D3CC7400A60610 /* EncoderAdapter.cpp */; };
- 93FC67C012D3CCF200A60610 /* EncoderAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 93FC67A012D3CC7400A60610 /* EncoderAdapter.h */; };
</del><span class="cx"> 9F54F88F16488E87007DF81A /* ChildProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F54F88E16488E87007DF81A /* ChildProcessMac.mm */; };
</span><span class="cx"> 9F54F8951648AE0F007DF81A /* PluginProcessManagerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */; };
</span><span class="cx"> 9FB5F394169E6A80002C25BF /* WKContextPrivateMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */; };
</span><span class="lines">@@ -3114,10 +3110,6 @@
</span><span class="cx"> 9391F284121B38F500EBF7E8 /* WebFrameNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebFrameNetworkingContext.mm; sourceTree = "<group>"; };
</span><span class="cx"> 939AE7651316E99C00AE06A6 /* WebCoreArgumentCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreArgumentCoders.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 93BDEB00171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageLoadTypesPrivate.h; sourceTree = "<group>"; };
</span><del>- 93FC679D12D3CC7400A60610 /* DecoderAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DecoderAdapter.cpp; sourceTree = "<group>"; };
- 93FC679E12D3CC7400A60610 /* DecoderAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DecoderAdapter.h; sourceTree = "<group>"; };
- 93FC679F12D3CC7400A60610 /* EncoderAdapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderAdapter.cpp; sourceTree = "<group>"; };
- 93FC67A012D3CC7400A60610 /* EncoderAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderAdapter.h; sourceTree = "<group>"; };
</del><span class="cx"> 9F54F88E16488E87007DF81A /* ChildProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 9F54F8941648AE0E007DF81A /* PluginProcessManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginProcessManagerMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContextPrivateMac.mm; path = mac/WKContextPrivateMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -5672,13 +5664,9 @@
</span><span class="cx"> 2D29ECCD192F2C2E00984B78 /* Cocoa */,
</span><span class="cx"> 2DA944B41884EA2A00ED86DB /* ios */,
</span><span class="cx"> BC963D6C113DD19500574BE2 /* mac */,
</span><del>- 93FC679D12D3CC7400A60610 /* DecoderAdapter.cpp */,
- 93FC679E12D3CC7400A60610 /* DecoderAdapter.h */,
</del><span class="cx"> BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */,
</span><span class="cx"> BC8452A61162C80900CAB9B5 /* DrawingArea.h */,
</span><span class="cx"> 1A64228A12DD024700CAAE2C /* DrawingArea.messages.in */,
</span><del>- 93FC679F12D3CC7400A60610 /* EncoderAdapter.cpp */,
- 93FC67A012D3CC7400A60610 /* EncoderAdapter.h */,
</del><span class="cx"> 1AA575F81496B52600A4EE06 /* EventDispatcher.cpp */,
</span><span class="cx"> 1AA575F91496B52600A4EE06 /* EventDispatcher.h */,
</span><span class="cx"> 1AA575FD1496B6F300A4EE06 /* EventDispatcher.messages.in */,
</span><span class="lines">@@ -7101,7 +7089,6 @@
</span><span class="cx"> 29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */,
</span><span class="cx"> 2984F57D164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h in Headers */,
</span><span class="cx"> 518353DF1887128B00D9FE44 /* KeyedDecoder.h in Headers */,
</span><del>- 93FC67BE12D3CCF200A60610 /* DecoderAdapter.h in Headers */,
</del><span class="cx"> BCE81D99131AE02100241910 /* DictionaryPopupInfo.h in Headers */,
</span><span class="cx"> C58CDF2E1887609F00871536 /* InteractionInformationAtPosition.h in Headers */,
</span><span class="cx"> 5167EEA0170377BF007681CA /* DiskCacheMonitor.h in Headers */,
</span><span class="lines">@@ -7128,7 +7115,6 @@
</span><span class="cx"> 5DA6ED0A1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.h in Headers */,
</span><span class="cx"> 0FCB4E4F18BBE044000FCFC9 /* WKGeolocationProviderIOS.h in Headers */,
</span><span class="cx"> 1AA41AB512C02EC4002BE67B /* EditorState.h in Headers */,
</span><del>- 93FC67C012D3CCF200A60610 /* EncoderAdapter.h in Headers */,
</del><span class="cx"> 51B15A8513843A3900321AD8 /* EnvironmentUtilities.h in Headers */,
</span><span class="cx"> 1A7C6CDB1378950800B9C04D /* EnvironmentVariables.h in Headers */,
</span><span class="cx"> 1AA575FB1496B52600A4EE06 /* EventDispatcher.h in Headers */,
</span><span class="lines">@@ -8768,7 +8754,6 @@
</span><span class="cx"> 29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */,
</span><span class="cx"> 0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 2984F57C164B915F004BC0C6 /* CustomProtocolManagerProxyMessageReceiver.cpp in Sources */,
</span><del>- 93FC67BD12D3CCF200A60610 /* DecoderAdapter.cpp in Sources */,
</del><span class="cx"> BCE81D98131AE02100241910 /* DictionaryPopupInfo.cpp in Sources */,
</span><span class="cx"> 5167EEA1170377BF007681CA /* DiskCacheMonitor.mm in Sources */,
</span><span class="cx"> 2DAF06D718BD1A470081CEB1 /* SmartMagnificationController.mm in Sources */,
</span><span class="lines">@@ -8789,7 +8774,6 @@
</span><span class="cx"> 5DA6ED0B1490606900B41D12 /* DynamicLinkerEnvironmentExtractor.mm in Sources */,
</span><span class="cx"> 8CFECE941490F140002AAA32 /* EditorState.cpp in Sources */,
</span><span class="cx"> 1AFDE6591954A42B00C48FFA /* SessionState.cpp in Sources */,
</span><del>- 93FC67BF12D3CCF200A60610 /* EncoderAdapter.cpp in Sources */,
</del><span class="cx"> 2DA944AD1884E9BA00ED86DB /* TextCheckerIOS.mm in Sources */,
</span><span class="cx"> 2DA944A21884E4F000ED86DB /* WebPlatformTouchPointIOS.cpp in Sources */,
</span><span class="cx"> 1A4D664B18A3030E00D82E21 /* WKFrameInfo.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDecoderAdaptercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp (170755 => 170756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp 2014-07-03 17:05:41 UTC (rev 170755)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.cpp 2014-07-03 17:09:42 UTC (rev 170756)
</span><span class="lines">@@ -1,136 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "DecoderAdapter.h"
-
-#include "DataReference.h"
-#include "WebCoreArgumentCoders.h"
-#include <wtf/text/WTFString.h>
-
-namespace WebKit {
-
-DecoderAdapter::DecoderAdapter(const uint8_t* buffer, size_t bufferSize)
- : m_decoder(buffer, bufferSize)
-{
- // Keep format compatibility by decoding an unused uint64_t value
- // that used to be encoded by the argument encoder.
- uint64_t value;
- m_decoder.decode(value);
- ASSERT(!value);
-}
-
-bool DecoderAdapter::decodeBytes(Vector<uint8_t>& bytes)
-{
- IPC::DataReference dataReference;
- if (!m_decoder.decode(dataReference))
- return false;
-
- bytes = dataReference.vector();
- return true;
-}
-
-bool DecoderAdapter::decodeBool(bool& value)
-{
- return m_decoder.decode(value);
-}
-
-bool DecoderAdapter::decodeUInt16(uint16_t& value)
-{
- return m_decoder.decode(value);
-}
-
-bool DecoderAdapter::decodeUInt32(uint32_t& value)
-{
- return m_decoder.decode(value);
-}
-
-bool DecoderAdapter::decodeUInt64(uint64_t& value)
-{
- return m_decoder.decode(value);
-}
-
-bool DecoderAdapter::decodeInt32(int32_t& value)
-{
- return m_decoder.decode(value);
-}
-
-bool DecoderAdapter::decodeInt64(int64_t& value)
-{
- return m_decoder.decode(value);
-}
-
-bool DecoderAdapter::decodeFloat(float& value)
-{
- return m_decoder.decode(value);
-}
-
-bool DecoderAdapter::decodeDouble(double& value)
-{
- return m_decoder.decode(value);
-}
-
-bool DecoderAdapter::decodeString(String& value)
-{
- // This mimics the IPC binary encoding of Strings prior to r88886.
- // Whenever the IPC binary encoding changes, we'll have to "undo" the changes here.
- // FIXME: We shouldn't use the IPC binary encoding format for history,
- // and we should come up with a migration strategy so we can actually bump the version number
- // without breaking encoding/decoding of the history tree.
-
- uint32_t length;
- if (!m_decoder.decode(length))
- return false;
-
- if (length == std::numeric_limits<uint32_t>::max()) {
- // This is the null string.
- value = String();
- return true;
- }
-
- uint64_t lengthInBytes;
- if (!m_decoder.decode(lengthInBytes))
- return false;
-
- if (lengthInBytes % sizeof(UChar) || lengthInBytes / sizeof(UChar) != length) {
- m_decoder.markInvalid();
- return false;
- }
-
- if (!m_decoder.bufferIsLargeEnoughToContain<UChar>(length)) {
- m_decoder.markInvalid();
- return false;
- }
-
- UChar* buffer;
- String string = String::createUninitialized(length, buffer);
- if (!m_decoder.decodeFixedLengthData(reinterpret_cast<uint8_t*>(buffer), length * sizeof(UChar), alignof(UChar)))
- return false;
-
- value = string;
- return true;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDecoderAdapterh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.h (170755 => 170756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.h 2014-07-03 17:05:41 UTC (rev 170755)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DecoderAdapter.h 2014-07-03 17:09:42 UTC (rev 170756)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DecoderAdapter_h
-#define DecoderAdapter_h
-
-#include "ArgumentDecoder.h"
-#include <wtf/Decoder.h>
-#include <wtf/Forward.h>
-
-namespace WebKit {
-
-class DecoderAdapter : public Decoder {
-public:
- DecoderAdapter(const uint8_t* buffer, size_t bufferSize);
-
-private:
- virtual bool decodeBytes(Vector<uint8_t>&);
- virtual bool decodeBool(bool&);
- virtual bool decodeUInt16(uint16_t&);
- virtual bool decodeUInt32(uint32_t&);
- virtual bool decodeUInt64(uint64_t&);
- virtual bool decodeInt32(int32_t&);
- virtual bool decodeInt64(int64_t&);
- virtual bool decodeFloat(float&);
- virtual bool decodeDouble(double&);
- virtual bool decodeString(String&);
-
- IPC::ArgumentDecoder m_decoder;
-};
-
-} // namespace WebKit
-
-#endif // DecoderAdapter_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEncoderAdaptercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp (170755 => 170756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp 2014-07-03 17:05:41 UTC (rev 170755)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.cpp 2014-07-03 17:09:42 UTC (rev 170756)
</span><span class="lines">@@ -1,114 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "EncoderAdapter.h"
-
-#include "DataReference.h"
-#include "WebCoreArgumentCoders.h"
-#include <wtf/text/StringView.h>
-
-namespace WebKit {
-
-EncoderAdapter::EncoderAdapter()
-{
- // Keep format compatibility by decoding an unused uint64_t value
- // that used to be encoded by the argument encoder.
- m_encoder << static_cast<uint64_t>(0);
-}
-
-IPC::DataReference EncoderAdapter::dataReference() const
-{
- return IPC::DataReference(m_encoder.buffer(), m_encoder.bufferSize());
-}
-
-void EncoderAdapter::encodeBytes(const uint8_t* bytes, size_t size)
-{
- m_encoder << IPC::DataReference(bytes, size);
-}
-
-void EncoderAdapter::encodeBool(bool value)
-{
- m_encoder << value;
-}
-
-void EncoderAdapter::encodeUInt16(uint16_t value)
-{
- m_encoder << value;
-}
-
-void EncoderAdapter::encodeUInt32(uint32_t value)
-{
- m_encoder << value;
-}
-
-void EncoderAdapter::encodeUInt64(uint64_t value)
-{
- m_encoder << value;
-}
-
-void EncoderAdapter::encodeInt32(int32_t value)
-{
- m_encoder << value;
-}
-
-void EncoderAdapter::encodeInt64(int64_t value)
-{
- m_encoder << value;
-}
-
-void EncoderAdapter::encodeFloat(float value)
-{
- m_encoder << value;
-}
-
-void EncoderAdapter::encodeDouble(double value)
-{
- m_encoder << value;
-}
-
-void EncoderAdapter::encodeString(const String& value)
-{
- // This mimics the IPC binary encoding of Strings prior to r88886.
- // Whenever the IPC binary encoding changes, we'll have to "undo" the changes here.
- // FIXME: We shouldn't use the IPC binary encoding format for history,
- // and we should come up with a migration strategy so we can actually bump the version number
- // without breaking encoding/decoding of the history tree.
-
- // Special case the null string.
- if (value.isNull()) {
- m_encoder << std::numeric_limits<uint32_t>::max();
- return;
- }
-
- uint32_t length = value.length();
- m_encoder << length;
-
- uint64_t lengthInBytes = length * sizeof(UChar);
- m_encoder << lengthInBytes;
- m_encoder.encodeFixedLengthData(reinterpret_cast<const uint8_t*>(StringView(value).upconvertedCharacters().get()), length * sizeof(UChar), alignof(UChar));
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEncoderAdapterh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h (170755 => 170756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h 2014-07-03 17:05:41 UTC (rev 170755)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EncoderAdapter.h 2014-07-03 17:09:42 UTC (rev 170756)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef EncoderAdapter_h
-#define EncoderAdapter_h
-
-#include "ArgumentEncoder.h"
-#include <wtf/Encoder.h>
-#include <wtf/Forward.h>
-
-namespace IPC {
- class ArgumentEncoder;
- class DataReference;
-}
-
-namespace WebKit {
-
-class EncoderAdapter : public Encoder {
-public:
- EncoderAdapter();
-
- IPC::DataReference dataReference() const;
-
-private:
- virtual void encodeBytes(const uint8_t*, size_t);
- virtual void encodeBool(bool);
- virtual void encodeUInt16(uint16_t value);
- virtual void encodeUInt32(uint32_t);
- virtual void encodeUInt64(uint64_t);
- virtual void encodeInt32(int32_t);
- virtual void encodeInt64(int64_t);
- virtual void encodeFloat(float);
- virtual void encodeDouble(double);
- virtual void encodeString(const String&);
-
- IPC::ArgumentEncoder m_encoder;
-};
-
-} // namespace WebKit
-
-#endif // EncoderAdapter_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (170755 => 170756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-03 17:05:41 UTC (rev 170755)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-03 17:09:42 UTC (rev 170756)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "DataReference.h"
</span><del>-#include "DecoderAdapter.h"
</del><span class="cx"> #include "DragControllerAction.h"
</span><span class="cx"> #include "DrawingArea.h"
</span><span class="cx"> #include "DrawingAreaMessages.h"
</span></span></pre>
</div>
</div>
</body>
</html>