Diff
Modified: trunk/Source/WebKit2/ChangeLog (89077 => 89078)
--- trunk/Source/WebKit2/ChangeLog 2011-06-16 22:29:45 UTC (rev 89077)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-16 23:10:49 UTC (rev 89078)
@@ -2,6 +2,29 @@
Reviewed by Sam Weinig.
+ Get rid of CoreIPC::In and CoreIPC::Out from some argument coders
+ https://bugs.webkit.org/show_bug.cgi?id=62832
+
+ * Shared/OriginAndDatabases.cpp:
+ (WebKit::OriginAndDatabases::encode):
+ (WebKit::OriginAndDatabases::decode):
+ * Shared/SecurityOriginData.cpp:
+ (WebKit::SecurityOriginData::encode):
+ (WebKit::SecurityOriginData::decode):
+ * Shared/WebKeyboardEvent.cpp:
+ (WebKit::WebKeyboardEvent::encode):
+ (WebKit::WebKeyboardEvent::decode):
+ * Shared/WebOpenPanelParameters.cpp:
+ (WebKit::WebOpenPanelParameters::Data::encode):
+ (WebKit::WebOpenPanelParameters::Data::decode):
+ * Shared/WebPreferencesStore.cpp:
+ (WebKit::WebPreferencesStore::encode):
+ (WebKit::WebPreferencesStore::decode):
+
+2011-06-16 Anders Carlsson <[email protected]>
+
+ Reviewed by Sam Weinig.
+
Cleanup ResourceRequest, ResourceResponse and ResourceError argument coders
https://bugs.webkit.org/show_bug.cgi?id=62803
Modified: trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp (89077 => 89078)
--- trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp 2011-06-16 22:29:45 UTC (rev 89077)
+++ trunk/Source/WebKit2/Shared/OriginAndDatabases.cpp 2011-06-16 23:10:49 UTC (rev 89078)
@@ -34,12 +34,24 @@
void OriginAndDatabases::encode(CoreIPC::ArgumentEncoder* encoder) const
{
- encoder->encode(CoreIPC::In(originIdentifier, originQuota, originUsage, databases));
+ encoder->encode(originIdentifier);
+ encoder->encode(originQuota);
+ encoder->encode(originUsage);
+ encoder->encode(databases);
}
bool OriginAndDatabases::decode(CoreIPC::ArgumentDecoder* decoder, OriginAndDatabases& originAndDatabases)
{
- return decoder->decode(CoreIPC::Out(originAndDatabases.originIdentifier, originAndDatabases.originQuota, originAndDatabases.originUsage, originAndDatabases.databases));
+ if (!decoder->decode(originAndDatabases.originIdentifier))
+ return false;
+ if (!decoder->decode(originAndDatabases.originQuota))
+ return false;
+ if (!decoder->decode(originAndDatabases.originUsage))
+ return false;
+ if (!decoder->decode(originAndDatabases.databases))
+ return false;
+
+ return true;
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.cpp (89077 => 89078)
--- trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2011-06-16 22:29:45 UTC (rev 89077)
+++ trunk/Source/WebKit2/Shared/SecurityOriginData.cpp 2011-06-16 23:10:49 UTC (rev 89078)
@@ -37,12 +37,21 @@
void SecurityOriginData::encode(CoreIPC::ArgumentEncoder* encoder) const
{
- encoder->encode(CoreIPC::In(protocol, host, port));
+ encoder->encode(protocol);
+ encoder->encode(host);
+ encoder->encode(port);
}
bool SecurityOriginData::decode(CoreIPC::ArgumentDecoder* decoder, SecurityOriginData& securityOriginData)
{
- return decoder->decode(CoreIPC::Out(securityOriginData.protocol, securityOriginData.host, securityOriginData.port));
+ if (!decoder->decode(securityOriginData.protocol))
+ return false;
+ if (!decoder->decode(securityOriginData.host))
+ return false;
+ if (!decoder->decode(securityOriginData.port))
+ return false;
+
+ return true;
}
void performAPICallbackWithSecurityOriginDataVector(const Vector<SecurityOriginData>& originDatas, ArrayCallback* callback)
Modified: trunk/Source/WebKit2/Shared/WebKeyboardEvent.cpp (89077 => 89078)
--- trunk/Source/WebKit2/Shared/WebKeyboardEvent.cpp 2011-06-16 22:29:45 UTC (rev 89077)
+++ trunk/Source/WebKit2/Shared/WebKeyboardEvent.cpp 2011-06-16 23:10:49 UTC (rev 89078)
@@ -49,19 +49,42 @@
{
WebEvent::encode(encoder);
- encoder->encode(CoreIPC::In(m_text, m_unmodifiedText, m_keyIdentifier, m_windowsVirtualKeyCode, m_nativeVirtualKeyCode, m_macCharCode));
- encoder->encode(CoreIPC::In(m_isAutoRepeat, m_isKeypad, m_isSystemKey));
+ encoder->encode(m_text);
+ encoder->encode(m_unmodifiedText);
+ encoder->encode(m_keyIdentifier);
+ encoder->encode(m_windowsVirtualKeyCode);
+ encoder->encode(m_nativeVirtualKeyCode);
+ encoder->encode(m_macCharCode);
+ encoder->encode(m_isAutoRepeat);
+ encoder->encode(m_isKeypad);
+ encoder->encode(m_isSystemKey);
}
-bool WebKeyboardEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebKeyboardEvent& t)
+bool WebKeyboardEvent::decode(CoreIPC::ArgumentDecoder* decoder, WebKeyboardEvent& result)
{
- if (!WebEvent::decode(decoder, t))
+ if (!WebEvent::decode(decoder, result))
return false;
- if (!decoder->decode(CoreIPC::Out(t.m_text, t.m_unmodifiedText, t.m_keyIdentifier, t.m_windowsVirtualKeyCode, t.m_nativeVirtualKeyCode, t.m_macCharCode)))
+ if (!decoder->decode(result.m_text))
return false;
+ if (!decoder->decode(result.m_unmodifiedText))
+ return false;
+ if (!decoder->decode(result.m_keyIdentifier))
+ return false;
+ if (!decoder->decode(result.m_windowsVirtualKeyCode))
+ return false;
+ if (!decoder->decode(result.m_nativeVirtualKeyCode))
+ return false;
+ if (!decoder->decode(result.m_macCharCode))
+ return false;
+ if (!decoder->decode(result.m_isAutoRepeat))
+ return false;
+ if (!decoder->decode(result.m_isKeypad))
+ return false;
+ if (!decoder->decode(result.m_isSystemKey))
+ return false;
- return decoder->decode(CoreIPC::Out(t.m_isAutoRepeat, t.m_isKeypad, t.m_isSystemKey));
+ return true;
}
bool WebKeyboardEvent::isKeyboardEventType(Type type)
Modified: trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp (89077 => 89078)
--- trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp 2011-06-16 22:29:45 UTC (rev 89077)
+++ trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp 2011-06-16 23:10:49 UTC (rev 89078)
@@ -46,12 +46,24 @@
void WebOpenPanelParameters::Data::encode(CoreIPC::ArgumentEncoder* encoder) const
{
- encoder->encode(CoreIPC::In(allowMultipleFiles, allowsDirectoryUpload, acceptTypes, filenames));
+ encoder->encode(allowMultipleFiles);
+ encoder->encode(allowsDirectoryUpload);
+ encoder->encode(acceptTypes);
+ encoder->encode(filenames);
}
bool WebOpenPanelParameters::Data::decode(CoreIPC::ArgumentDecoder* decoder, Data& result)
{
- return decoder->decode(CoreIPC::Out(result.allowMultipleFiles, result.allowsDirectoryUpload, result.acceptTypes, result.filenames));
+ if (!decoder->decode(result.allowMultipleFiles))
+ return false;
+ if (!decoder->decode(result.allowsDirectoryUpload))
+ return false;
+ if (!decoder->decode(result.acceptTypes))
+ return false;
+ if (!decoder->decode(result.filenames))
+ return false;
+
+ return true;
}
} // namespace WebCore
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp (89077 => 89078)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp 2011-06-16 22:29:45 UTC (rev 89077)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.cpp 2011-06-16 23:10:49 UTC (rev 89078)
@@ -57,16 +57,25 @@
void WebPreferencesStore::encode(CoreIPC::ArgumentEncoder* encoder) const
{
- encoder->encode(CoreIPC::In(m_stringValues, m_boolValues, m_uint32Values, m_doubleValues));
+ encoder->encode(m_stringValues);
+ encoder->encode(m_boolValues);
+ encoder->encode(m_uint32Values);
+ encoder->encode(m_doubleValues);
}
-bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder* decoder, WebPreferencesStore& s)
+bool WebPreferencesStore::decode(CoreIPC::ArgumentDecoder* decoder, WebPreferencesStore& result)
{
- if (!decoder->decode(CoreIPC::Out(s.m_stringValues, s.m_boolValues, s.m_uint32Values, s.m_doubleValues)))
+ if (!decoder->decode(result.m_stringValues))
return false;
+ if (!decoder->decode(result.m_boolValues))
+ return false;
+ if (!decoder->decode(result.m_uint32Values))
+ return false;
+ if (!decoder->decode(result.m_doubleValues))
+ return false;
if (hasXSSAuditorEnabledTestRunnerOverride)
- s.m_boolValues.set(WebPreferencesKey::xssAuditorEnabledKey(), xssAuditorEnabledTestRunnerOverride);
+ result.m_boolValues.set(WebPreferencesKey::xssAuditorEnabledKey(), xssAuditorEnabledTestRunnerOverride);
return true;
}
