summaryrefslogtreecommitdiff
path: root/Source/WebKit2/Shared/win
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebKit2/Shared/win')
-rw-r--r--Source/WebKit2/Shared/win/LayerTreeContextWin.cpp4
-rw-r--r--Source/WebKit2/Shared/win/PlatformCertificateInfo.cpp8
-rw-r--r--Source/WebKit2/Shared/win/PlatformCertificateInfo.h2
-rw-r--r--Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp12
-rw-r--r--Source/WebKit2/Shared/win/WindowGeometry.cpp10
-rw-r--r--Source/WebKit2/Shared/win/WindowGeometry.h2
6 files changed, 19 insertions, 19 deletions
diff --git a/Source/WebKit2/Shared/win/LayerTreeContextWin.cpp b/Source/WebKit2/Shared/win/LayerTreeContextWin.cpp
index ad05c1d03..5dd7c667e 100644
--- a/Source/WebKit2/Shared/win/LayerTreeContextWin.cpp
+++ b/Source/WebKit2/Shared/win/LayerTreeContextWin.cpp
@@ -39,9 +39,9 @@ LayerTreeContext::~LayerTreeContext()
{
}
-void LayerTreeContext::encode(CoreIPC::ArgumentEncoder* encoder) const
+void LayerTreeContext::encode(CoreIPC::ArgumentEncoder& encoder) const
{
- encoder->encode(reinterpret_cast<uint64_t>(window));
+ encoder.encode(reinterpret_cast<uint64_t>(window));
}
bool LayerTreeContext::decode(CoreIPC::ArgumentDecoder* decoder, LayerTreeContext& context)
diff --git a/Source/WebKit2/Shared/win/PlatformCertificateInfo.cpp b/Source/WebKit2/Shared/win/PlatformCertificateInfo.cpp
index 08cd4e2b3..5b0d20a84 100644
--- a/Source/WebKit2/Shared/win/PlatformCertificateInfo.cpp
+++ b/Source/WebKit2/Shared/win/PlatformCertificateInfo.cpp
@@ -106,19 +106,19 @@ PlatformCertificateInfo& PlatformCertificateInfo::operator=(const PlatformCertif
return *this;
}
-void PlatformCertificateInfo::encode(CoreIPC::ArgumentEncoder* encoder) const
+void PlatformCertificateInfo::encode(CoreIPC::ArgumentEncoder& encoder) const
{
// Special case no certificates
if (m_certificateChain.isEmpty()) {
- encoder->encode(std::numeric_limits<uint64_t>::max());
+ encoder.encode(std::numeric_limits<uint64_t>::max());
return;
}
uint64_t length = m_certificateChain.size();
- encoder->encode(length);
+ encoder.encode(length);
for (size_t i = 0; i < length; ++i)
- encoder->encodeVariableLengthByteArray(CoreIPC::DataReference(static_cast<uint8_t*>(m_certificateChain[i]->pbCertEncoded), m_certificateChain[i]->cbCertEncoded));
+ encoder.encodeVariableLengthByteArray(CoreIPC::DataReference(static_cast<uint8_t*>(m_certificateChain[i]->pbCertEncoded), m_certificateChain[i]->cbCertEncoded));
}
bool PlatformCertificateInfo::decode(CoreIPC::ArgumentDecoder* decoder, PlatformCertificateInfo& c)
diff --git a/Source/WebKit2/Shared/win/PlatformCertificateInfo.h b/Source/WebKit2/Shared/win/PlatformCertificateInfo.h
index dd999ef25..7637bbbc5 100644
--- a/Source/WebKit2/Shared/win/PlatformCertificateInfo.h
+++ b/Source/WebKit2/Shared/win/PlatformCertificateInfo.h
@@ -51,7 +51,7 @@ public:
const Vector<PCCERT_CONTEXT>& certificateChain() const { return m_certificateChain; }
- void encode(CoreIPC::ArgumentEncoder* encoder) const;
+ void encode(CoreIPC::ArgumentEncoder&) const;
static bool decode(CoreIPC::ArgumentDecoder* decoder, PlatformCertificateInfo& t);
private:
diff --git a/Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp b/Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp
index a61409194..7f04db08f 100644
--- a/Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp
+++ b/Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp
@@ -49,11 +49,11 @@ namespace CoreIPC {
// FIXME: These coders should really go in a WebCoreArgumentCodersCFNetwork file.
-void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder* encoder, const ResourceRequest& resourceRequest)
+void ArgumentCoder<ResourceRequest>::encodePlatformData(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
{
#if USE(CFNETWORK)
bool requestIsPresent = resourceRequest.cfURLRequest();
- encoder->encode(requestIsPresent);
+ encoder << requestIsPresent;
if (!requestIsPresent)
return;
@@ -95,11 +95,11 @@ bool ArgumentCoder<ResourceRequest>::decodePlatformData(ArgumentDecoder* decoder
}
-void ArgumentCoder<ResourceResponse>::encodePlatformData(ArgumentEncoder* encoder, const ResourceResponse& resourceResponse)
+void ArgumentCoder<ResourceResponse>::encodePlatformData(ArgumentEncoder& encoder, const ResourceResponse& resourceResponse)
{
#if USE(CFNETWORK)
bool responseIsPresent = resourceResponse.cfURLResponse();
- encoder->encode(responseIsPresent);
+ encoder << responseIsPresent;
if (!responseIsPresent)
return;
@@ -137,10 +137,10 @@ bool ArgumentCoder<ResourceResponse>::decodePlatformData(ArgumentDecoder* decode
}
-void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder* encoder, const ResourceError& resourceError)
+void ArgumentCoder<ResourceError>::encodePlatformData(ArgumentEncoder& encoder, const ResourceError& resourceError)
{
#if USE(CFNETWORK)
- encoder->encode(PlatformCertificateInfo(resourceError.certificate()));
+ encoder << PlatformCertificateInfo(resourceError.certificate());
#endif
}
diff --git a/Source/WebKit2/Shared/win/WindowGeometry.cpp b/Source/WebKit2/Shared/win/WindowGeometry.cpp
index 73caa05dd..da40d246f 100644
--- a/Source/WebKit2/Shared/win/WindowGeometry.cpp
+++ b/Source/WebKit2/Shared/win/WindowGeometry.cpp
@@ -36,12 +36,12 @@ WindowGeometry::WindowGeometry()
{
}
-void WindowGeometry::encode(CoreIPC::ArgumentEncoder* encoder) const
+void WindowGeometry::encode(CoreIPC::ArgumentEncoder& encoder) const
{
- encoder->encode(reinterpret_cast<uint64_t>(window));
- encoder->encode(visible);
- encoder->encode(frame);
- encoder->encode(clipRect);
+ encoder.encode(reinterpret_cast<uint64_t>(window));
+ encoder.encode(visible);
+ encoder.encode(frame);
+ encoder.encode(clipRect);
}
bool WindowGeometry::decode(CoreIPC::ArgumentDecoder* decoder, WindowGeometry& geometry)
diff --git a/Source/WebKit2/Shared/win/WindowGeometry.h b/Source/WebKit2/Shared/win/WindowGeometry.h
index c5542bd26..9194e531f 100644
--- a/Source/WebKit2/Shared/win/WindowGeometry.h
+++ b/Source/WebKit2/Shared/win/WindowGeometry.h
@@ -38,7 +38,7 @@ namespace WebKit {
struct WindowGeometry {
WindowGeometry();
- void encode(CoreIPC::ArgumentEncoder*) const;
+ void encode(CoreIPC::ArgumentEncoder&) const;
static bool decode(CoreIPC::ArgumentDecoder*, WindowGeometry&);
HWND window;