webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 9 deletions

diff --git a/Source/WebKit2/Shared/WebPageGroupData.cpp b/Source/WebKit2/Shared/WebPageGroupData.cpp
index 28bace115..6321b0139 100644
--- a/Source/WebKit2/Shared/WebPageGroupData.cpp
+++ b/Source/WebKit2/Shared/WebPageGroupData.cpp
@@ -30,19 +30,18 @@
 
 namespace WebKit {
 
-void WebPageGroupData::encode(IPC::ArgumentEncoder& encoder) const
+void WebPageGroupData::encode(IPC::Encoder& encoder) const
 {
-    encoder << identifer;
+    encoder << identifier;
     encoder << pageGroupID;
     encoder << visibleToInjectedBundle;
     encoder << visibleToHistoryClient;
-    encoder << userStyleSheets;
-    encoder << userScripts;
+    encoder << userContentControllerIdentifier;
 }
 
-bool WebPageGroupData::decode(IPC::ArgumentDecoder& decoder, WebPageGroupData& data)
+bool WebPageGroupData::decode(IPC::Decoder& decoder, WebPageGroupData& data)
 {
-    if (!decoder.decode(data.identifer))
+    if (!decoder.decode(data.identifier))
         return false;
     if (!decoder.decode(data.pageGroupID))
         return false;
@@ -50,9 +49,7 @@ bool WebPageGroupData::decode(IPC::ArgumentDecoder& decoder, WebPageGroupData& d
         return false;
     if (!decoder.decode(data.visibleToHistoryClient))
         return false;
-    if (!decoder.decode(data.userStyleSheets))
-        return false;
-    if (!decoder.decode(data.userScripts))
+    if (!decoder.decode(data.userContentControllerIdentifier))
         return false;
     return true;
 }