<!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>[177806] 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/177806">177806</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-29 11:38:19 -0800 (Mon, 29 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the old user message coder code
https://bugs.webkit.org/show_bug.cgi?id=139994
Reviewed by Sam Weinig.
* Platform/IPC/HandleMessage.h:
(IPC::callMemberFunctionImpl): Deleted.
(IPC::callMemberFunction): Deleted.
(IPC::handleMessageVariadic): Deleted.
* Scripts/webkit/messages.py:
(decode_type):
(async_message_statement):
(sync_message_statement):
* Shared/UserMessageCoders.h: Removed.
* Shared/mac/ObjCObjectGraphCoders.h: Removed.
* Shared/mac/ObjCObjectGraphCoders.mm: Removed.
* UIProcess/WebConnectionToWebProcess.cpp:
* UIProcess/WebContextUserMessageCoders.h: Removed.
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebProcessPool.cpp:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
* WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h: Removed.
* WebProcess/WebConnectionToUIProcess.cpp:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
* WebProcess/WebPage/WebContextMenu.cpp:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/mac/WebPageMac.mm:
* WebProcess/WebProcess.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCHandleMessageh">trunk/Source/WebKit2/Platform/IPC/HandleMessage.h</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkitmessagespy">trunk/Source/WebKit2/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebConnectionToWebProcesscpp">trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebConnectionToUIProcesscpp">trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebContextMenucpp">trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacObjCObjectGraphCodersh">trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacObjCObjectGraphCodersmm">trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextUserMessageCodersh">trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleUserMessageCodersh">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-12-29 Anders Carlsson <andersca@apple.com>
+
+ Remove the old user message coder code
+ https://bugs.webkit.org/show_bug.cgi?id=139994
+
+ Reviewed by Sam Weinig.
+
+ * Platform/IPC/HandleMessage.h:
+ (IPC::callMemberFunctionImpl): Deleted.
+ (IPC::callMemberFunction): Deleted.
+ (IPC::handleMessageVariadic): Deleted.
+ * Scripts/webkit/messages.py:
+ (decode_type):
+ (async_message_statement):
+ (sync_message_statement):
+ * Shared/UserMessageCoders.h: Removed.
+ * Shared/mac/ObjCObjectGraphCoders.h: Removed.
+ * Shared/mac/ObjCObjectGraphCoders.mm: Removed.
+ * UIProcess/WebConnectionToWebProcess.cpp:
+ * UIProcess/WebContextUserMessageCoders.h: Removed.
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebProcessPool.cpp:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h: Removed.
+ * WebProcess/WebConnectionToUIProcess.cpp:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ * WebProcess/WebPage/WebContextMenu.cpp:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ * WebProcess/WebProcess.cpp:
+
</ins><span class="cx"> 2014-12-29 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Move WebPasteboardProxy from Shared to UIProcess, where it should have been all along
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCHandleMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/HandleMessage.h (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -78,34 +78,6 @@
</span><span class="cx"> callMemberFunctionImpl(object, function, connection, std::forward<ArgsTuple>(args), replyArgs, ArgsIndicies(), ReplyArgsIndicies());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Variadic dispatch functions.
-
-template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex>
-void callMemberFunctionImpl(C* object, MF function, MessageDecoder& decoder, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
-{
- (object->*function)(std::get<ArgsIndex>(std::forward<ArgsTuple>(args))..., decoder);
-}
-
-template<typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
-void callMemberFunction(ArgsTuple&& args, MessageDecoder& decoder, C* object, MF function)
-{
- callMemberFunctionImpl(object, function, decoder, std::forward<ArgsTuple>(args), ArgsIndicies());
-}
-
-// Variadic dispatch functions with non-variadic reply arguments.
-
-template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex, typename ReplyArgsTuple, size_t... ReplyArgsIndex>
-void callMemberFunctionImpl(C* object, MF function, MessageDecoder& decoder, ArgsTuple&& args, ReplyArgsTuple& replyArgs, std::index_sequence<ArgsIndex...>, std::index_sequence<ReplyArgsIndex...>)
-{
- (object->*function)(std::get<ArgsIndex>(std::forward<ArgsTuple>(args))..., decoder, std::get<ReplyArgsIndex>(replyArgs)...);
-}
-
-template <typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>, typename ReplyArgsTuple, typename ReplyArgsIndicies = std::make_index_sequence<std::tuple_size<ReplyArgsTuple>::value>>
-void callMemberFunction(ArgsTuple&& args, MessageDecoder& decoder, ReplyArgsTuple& replyArgs, C* object, MF function)
-{
- callMemberFunctionImpl(object, function, decoder, std::forward<ArgsTuple>(args), replyArgs, ArgsIndicies(), ReplyArgsIndicies());
-}
-
</del><span class="cx"> // Main dispatch functions
</span><span class="cx">
</span><span class="cx"> template<typename T, typename C, typename MF>
</span><span class="lines">@@ -160,31 +132,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename C, typename MF>
</span><del>-void handleMessageVariadic(MessageDecoder& decoder, C* object, MF function)
-{
- typename T::DecodeType arguments;
- if (!decoder.decode(arguments)) {
- ASSERT(decoder.isInvalid());
- return;
- }
- callMemberFunction(WTF::move(arguments), decoder, object, function);
-}
-
-template<typename T, typename C, typename MF>
-void handleMessageVariadic(MessageDecoder& decoder, MessageEncoder& replyEncoder, C* object, MF function)
-{
- typename T::DecodeType arguments;
- if (!decoder.decode(arguments)) {
- ASSERT(decoder.isInvalid());
- return;
- }
-
- typename T::Reply::ValueType replyArguments;
- callMemberFunction(WTF::move(arguments), decoder, replyArguments, object, function);
- replyEncoder << replyArguments;
-}
-
-template<typename T, typename C, typename MF>
</del><span class="cx"> void handleMessageDelayed(Connection* connection, MessageDecoder& decoder, std::unique_ptr<MessageEncoder>& replyEncoder, C* object, MF function)
</span><span class="cx"> {
</span><span class="cx"> typename T::DecodeType arguments;
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> WANTS_CONNECTION_ATTRIBUTE = 'WantsConnection'
</span><span class="cx"> LEGACY_RECEIVER_ATTRIBUTE = 'LegacyReceiver'
</span><span class="cx"> DELAYED_ATTRIBUTE = 'Delayed'
</span><del>-VARIADIC_ATTRIBUTE = 'Variadic'
</del><span class="cx">
</span><span class="cx"> _license_header = """/*
</span><span class="cx"> * Copyright (C) 2010 Apple Inc. All rights reserved.
</span><span class="lines">@@ -102,14 +101,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def decode_type(message):
</span><del>- parameters = message.parameters
</del><ins>+ return 'std::tuple<%s>' % ', '.join(parameter.type for parameter in message.parameters)
</ins><span class="cx">
</span><del>- if message.has_attribute(VARIADIC_ATTRIBUTE):
- parameters = parameters[:-1]
</del><span class="cx">
</span><del>- return 'std::tuple<%s>' % ', '.join(parameter.type for parameter in parameters)
-
-
</del><span class="cx"> def message_to_struct_declaration(message):
</span><span class="cx"> result = []
</span><span class="cx"> function_parameters = [(function_parameter_type(x.type), x.name) for x in message.parameters]
</span><span class="lines">@@ -269,8 +263,6 @@
</span><span class="cx"> dispatch_function_args = ['decoder', 'this', '&%s' % handler_function(receiver, message)]
</span><span class="cx">
</span><span class="cx"> dispatch_function = 'handleMessage'
</span><del>- if message.has_attribute(VARIADIC_ATTRIBUTE):
- dispatch_function += 'Variadic'
</del><span class="cx">
</span><span class="cx"> if message.has_attribute(WANTS_CONNECTION_ATTRIBUTE):
</span><span class="cx"> dispatch_function_args.insert(0, 'connection')
</span><span class="lines">@@ -287,8 +279,6 @@
</span><span class="cx"> dispatch_function = 'handleMessage'
</span><span class="cx"> if message.has_attribute(DELAYED_ATTRIBUTE):
</span><span class="cx"> dispatch_function += 'Delayed'
</span><del>- if message.has_attribute(VARIADIC_ATTRIBUTE):
- dispatch_function += 'Variadic'
</del><span class="cx">
</span><span class="cx"> wants_connection = message.has_attribute(DELAYED_ATTRIBUTE) or message.has_attribute(WANTS_CONNECTION_ATTRIBUTE)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/UserMessageCoders.h (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -1,557 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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 UserMessageCoders_h
-#define UserMessageCoders_h
-
-#include "APIArray.h"
-#include "APIData.h"
-#include "APIDictionary.h"
-#include "APIError.h"
-#include "APIGeometry.h"
-#include "APINumber.h"
-#include "APISerializedScriptValue.h"
-#include "APIString.h"
-#include "APIURL.h"
-#include "APIURLRequest.h"
-#include "APIURLResponse.h"
-#include "APIUserContentURLPattern.h"
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include "DataReference.h"
-#include "ShareableBitmap.h"
-#include "WebCertificateInfo.h"
-#include "WebCoreArgumentCoders.h"
-#include "WebImage.h"
-#include "WebRenderLayer.h"
-#include "WebRenderObject.h"
-
-namespace WebKit {
-
-// - Null -> Null
-// - API::Array -> API::Array
-// - API::Dictionary -> API::Dictionary
-// - SerializedScriptValue -> SerializedScriptValue
-// - API::String -> API::String
-// - UserContentURLPattern -> UserContentURLPattern
-// - WebCertificateInfo -> WebCertificateInfo
-// - API::Data -> API::Data
-// - API::Double -> API::Double
-// - WebImage -> WebImage
-// - WebRenderLayer -> WebRenderLayer
-// - WebRenderObject -> WebRenderObject
-// - API::UInt64 -> API::UInt64
-// - API::URL -> API::URL
-// - API::URLRequest -> API::URLRequest
-// - API::URLResponse -> API::URLResponse
-// - API::Error -> API::Error
-
-template<typename Owner>
-class UserMessageEncoder {
-public:
- bool baseEncode(IPC::ArgumentEncoder& encoder, const Owner& coder, API::Object::Type& type) const
- {
- if (!m_root) {
- encoder << static_cast<uint32_t>(API::Object::Type::Null);
- return true;
- }
-
- type = m_root->type();
- encoder << static_cast<uint32_t>(type);
-
- switch (type) {
- case API::Object::Type::Array: {
- API::Array* array = static_cast<API::Array*>(m_root);
- encoder << static_cast<uint64_t>(array->size());
- for (size_t i = 0; i < array->size(); ++i)
- encoder << Owner(coder, array->at(i));
- return true;
- }
- case API::Object::Type::Dictionary: {
- API::Dictionary* dictionary = static_cast<API::Dictionary*>(m_root);
- const API::Dictionary::MapType& map = dictionary->map();
- encoder << static_cast<uint64_t>(map.size());
-
- API::Dictionary::MapType::const_iterator it = map.begin();
- API::Dictionary::MapType::const_iterator end = map.end();
- for (; it != end; ++it) {
- encoder << it->key;
- encoder << Owner(coder, it->value.get());
- }
- return true;
- }
- case API::Object::Type::String: {
- API::String* string = static_cast<API::String*>(m_root);
- encoder << string->string();
- return true;
- }
- case API::Object::Type::SerializedScriptValue: {
- API::SerializedScriptValue* scriptValue = static_cast<API::SerializedScriptValue*>(m_root);
- encoder << scriptValue->dataReference();
- return true;
- }
- case API::Object::Type::Boolean: {
- API::Boolean* booleanObject = static_cast<API::Boolean*>(m_root);
- encoder << booleanObject->value();
- return true;
- }
- case API::Object::Type::Double: {
- API::Double* doubleObject = static_cast<API::Double*>(m_root);
- encoder << doubleObject->value();
- return true;
- }
- case API::Object::Type::UInt64: {
- API::UInt64* uint64Object = static_cast<API::UInt64*>(m_root);
- encoder << uint64Object->value();
- return true;
- }
- case API::Object::Type::Point: {
- API::Point* pointObject = static_cast<API::Point*>(m_root);
- encoder << pointObject->point().x;
- encoder << pointObject->point().y;
- return true;
- }
- case API::Object::Type::Size: {
- API::Size* sizeObject = static_cast<API::Size*>(m_root);
- encoder << sizeObject->size().width;
- encoder << sizeObject->size().height;
- return true;
- }
- case API::Object::Type::Rect: {
- API::Rect* rectObject = static_cast<API::Rect*>(m_root);
- encoder << rectObject->rect().origin.x;
- encoder << rectObject->rect().origin.y;
- encoder << rectObject->rect().size.width;
- encoder << rectObject->rect().size.height;
- return true;
- }
- case API::Object::Type::RenderLayer: {
- WebRenderLayer* renderLayer = static_cast<WebRenderLayer*>(m_root);
- encoder << Owner(coder, renderLayer->renderer());
- encoder << renderLayer->isReflection();
- encoder << renderLayer->isClipping();
- encoder << renderLayer->isClipped();
- encoder << static_cast<uint32_t>(renderLayer->compositingLayerType());
- encoder << renderLayer->absoluteBoundingBox();
- encoder << renderLayer->backingStoreMemoryEstimate();
- encoder << Owner(coder, renderLayer->negativeZOrderList());
- encoder << Owner(coder, renderLayer->normalFlowList());
- encoder << Owner(coder, renderLayer->positiveZOrderList());
- encoder << Owner(coder, renderLayer->frameContentsLayer());
- return true;
- }
- case API::Object::Type::RenderObject: {
- WebRenderObject* renderObject = static_cast<WebRenderObject*>(m_root);
- encoder << renderObject->name();
- encoder << renderObject->elementTagName();
- encoder << renderObject->elementID();
- encoder << Owner(coder, renderObject->elementClassNames());
- encoder << renderObject->absolutePosition();
- encoder << renderObject->frameRect();
- encoder << renderObject->textSnippet();
- encoder << renderObject->textLength();
- encoder << Owner(coder, renderObject->children());
- return true;
- }
- case API::Object::Type::URL: {
- API::URL* urlObject = static_cast<API::URL*>(m_root);
- encoder << urlObject->string();
- return true;
- }
- case API::Object::Type::URLRequest: {
- API::URLRequest* urlRequestObject = static_cast<API::URLRequest*>(m_root);
- encoder << urlRequestObject->resourceRequest();
- return true;
- }
- case API::Object::Type::URLResponse: {
- API::URLResponse* urlResponseObject = static_cast<API::URLResponse*>(m_root);
- encoder << urlResponseObject->resourceResponse();
- return true;
- }
- case API::Object::Type::UserContentURLPattern: {
- API::UserContentURLPattern* urlPattern = static_cast<API::UserContentURLPattern*>(m_root);
- encoder << urlPattern->patternString();
- return true;
- }
- case API::Object::Type::Image: {
- WebImage* image = static_cast<WebImage*>(m_root);
-
- ShareableBitmap::Handle handle;
- ASSERT(!image->bitmap() || image->bitmap()->isBackedBySharedMemory());
- if (!image->bitmap() || !image->bitmap()->isBackedBySharedMemory() || !image->bitmap()->createHandle(handle)) {
- // Initial false indicates no allocated bitmap or is not shareable.
- encoder << false;
- return true;
- }
-
- // Initial true indicates a bitmap was allocated and is shareable.
- encoder << true;
-
- encoder << handle;
- return true;
- }
- case API::Object::Type::Data: {
- API::Data* data = static_cast<API::Data*>(m_root);
- encoder << data->dataReference();
- return true;
- }
- case API::Object::Type::CertificateInfo: {
- WebCertificateInfo* certificateInfo = static_cast<WebCertificateInfo*>(m_root);
- encoder << certificateInfo->certificateInfo();
- return true;
- }
- case API::Object::Type::Error: {
- API::Error* errorObject = static_cast<API::Error*>(m_root);
- encoder << errorObject->platformError();
- return true;
- }
- default:
- break;
- }
-
- return false;
- }
-
-protected:
- UserMessageEncoder(API::Object* root)
- : m_root(root)
- {
- }
-
- API::Object* m_root;
-};
-
-
-// Handles
-// - Null -> Null
-// - API::Array -> API::Array
-// - Dictionary -> Dictionary
-// - SerializedScriptValue -> SerializedScriptValue
-// - API::String -> API::String
-// - UserContentURLPattern -> UserContentURLPattern
-// - WebCertificateInfo -> WebCertificateInfo
-// - API::Data -> API::Data
-// - API::Double -> API::Double
-// - WebImage -> WebImage
-// - API::UInt64 -> API::UInt64
-// - API::URL -> API::URL
-// - API::URLRequest -> API::URLRequest
-// - API::URLResponse -> API::URLResponse
-// - API::Error -> API::Error
-
-template<typename Owner>
-class UserMessageDecoder {
-public:
- static bool baseDecode(IPC::ArgumentDecoder& decoder, Owner& coder, API::Object::Type& type)
- {
- uint32_t typeAsUInt32;
- if (!decoder.decode(typeAsUInt32))
- return false;
-
- type = static_cast<API::Object::Type>(typeAsUInt32);
-
- switch (type) {
- case API::Object::Type::Array: {
- uint64_t size;
- if (!decoder.decode(size))
- return false;
-
- Vector<RefPtr<API::Object>> vector;
- for (size_t i = 0; i < size; ++i) {
- RefPtr<API::Object> element;
- Owner messageCoder(coder, element);
- if (!decoder.decode(messageCoder))
- return false;
- vector.append(element.release());
- }
-
- coder.m_root = API::Array::create(WTF::move(vector));
- break;
- }
- case API::Object::Type::Dictionary: {
- uint64_t size;
- if (!decoder.decode(size))
- return false;
-
- API::Dictionary::MapType map;
- for (size_t i = 0; i < size; ++i) {
- String key;
- if (!decoder.decode(key))
- return false;
-
- RefPtr<API::Object> element;
- Owner messageCoder(coder, element);
- if (!decoder.decode(messageCoder))
- return false;
-
- API::Dictionary::MapType::AddResult result = map.set(key, element.release());
- if (!result.isNewEntry)
- return false;
- }
-
- coder.m_root = API::Dictionary::create(WTF::move(map));
- break;
- }
- case API::Object::Type::String: {
- String string;
- if (!decoder.decode(string))
- return false;
- coder.m_root = API::String::create(string);
- break;
- }
- case API::Object::Type::SerializedScriptValue: {
- IPC::DataReference dataReference;
- if (!decoder.decode(dataReference))
- return false;
-
- Vector<uint8_t> vector = dataReference.vector();
- coder.m_root = API::SerializedScriptValue::adopt(vector);
- break;
- }
- case API::Object::Type::Double: {
- double value;
- if (!decoder.decode(value))
- return false;
- coder.m_root = API::Double::create(value);
- break;
- }
- case API::Object::Type::UInt64: {
- uint64_t value;
- if (!decoder.decode(value))
- return false;
- coder.m_root = API::UInt64::create(value);
- break;
- }
- case API::Object::Type::Boolean: {
- bool value;
- if (!decoder.decode(value))
- return false;
- coder.m_root = API::Boolean::create(value);
- break;
- }
- case API::Object::Type::Size: {
- double width;
- double height;
- if (!decoder.decode(width))
- return false;
- if (!decoder.decode(height))
- return false;
- coder.m_root = API::Size::create(WKSizeMake(width, height));
- break;
- }
- case API::Object::Type::Point: {
- double x;
- double y;
- if (!decoder.decode(x))
- return false;
- if (!decoder.decode(y))
- return false;
- coder.m_root = API::Point::create(WKPointMake(x, y));
- break;
- }
- case API::Object::Type::Rect: {
- double x;
- double y;
- double width;
- double height;
- if (!decoder.decode(x))
- return false;
- if (!decoder.decode(y))
- return false;
- if (!decoder.decode(width))
- return false;
- if (!decoder.decode(height))
- return false;
- coder.m_root = API::Rect::create(WKRectMake(x, y, width, height));
- break;
- }
- case API::Object::Type::RenderLayer: {
- RefPtr<API::Object> renderer;
- bool isReflection;
- bool isClipping;
- bool isClipped;
- uint32_t compositingLayerTypeAsUInt32;
- WebCore::IntRect absoluteBoundingBox;
- double backingStoreMemoryEstimate;
- RefPtr<API::Object> negativeZOrderList;
- RefPtr<API::Object> normalFlowList;
- RefPtr<API::Object> positiveZOrderList;
- RefPtr<API::Object> frameContentsLayer;
-
- Owner rendererCoder(coder, renderer);
- if (!decoder.decode(rendererCoder))
- return false;
- if (renderer->type() != API::Object::Type::RenderObject)
- return false;
- if (!decoder.decode(isReflection))
- return false;
- if (!decoder.decode(isClipping))
- return false;
- if (!decoder.decode(isClipped))
- return false;
- if (!decoder.decode(compositingLayerTypeAsUInt32))
- return false;
- if (!decoder.decode(absoluteBoundingBox))
- return false;
- if (!decoder.decode(backingStoreMemoryEstimate))
- return false;
- Owner negativeZOrderListCoder(coder, negativeZOrderList);
- if (!decoder.decode(negativeZOrderListCoder))
- return false;
- Owner normalFlowListCoder(coder, normalFlowList);
- if (!decoder.decode(normalFlowListCoder))
- return false;
- Owner positiveZOrderListCoder(coder, positiveZOrderList);
- if (!decoder.decode(positiveZOrderListCoder))
- return false;
-
- Owner frameContentsLayerCoder(coder, frameContentsLayer);
- if (!decoder.decode(frameContentsLayerCoder))
- return false;
-
- coder.m_root = WebRenderLayer::create(static_pointer_cast<WebRenderObject>(renderer), isReflection, isClipping, isClipped, static_cast<WebRenderLayer::CompositingLayerType>(compositingLayerTypeAsUInt32),
- absoluteBoundingBox, backingStoreMemoryEstimate, static_pointer_cast<API::Array>(negativeZOrderList), static_pointer_cast<API::Array>(normalFlowList),
- static_pointer_cast<API::Array>(positiveZOrderList), static_pointer_cast<WebRenderLayer>(frameContentsLayer));
- break;
- }
- case API::Object::Type::RenderObject: {
- String name;
- String textSnippet;
- String elementTagName;
- String elementID;
- unsigned textLength;
- RefPtr<API::Object> elementClassNames;
- WebCore::IntPoint absolutePosition;
- WebCore::IntRect frameRect;
- RefPtr<API::Object> children;
-
- if (!decoder.decode(name))
- return false;
- if (!decoder.decode(elementTagName))
- return false;
- if (!decoder.decode(elementID))
- return false;
- Owner classNamesCoder(coder, elementClassNames);
- if (!decoder.decode(classNamesCoder))
- return false;
- if (!decoder.decode(absolutePosition))
- return false;
- if (!decoder.decode(frameRect))
- return false;
- if (!decoder.decode(textSnippet))
- return false;
- if (!decoder.decode(textLength))
- return false;
- Owner messageCoder(coder, children);
- if (!decoder.decode(messageCoder))
- return false;
- if (children && children->type() != API::Object::Type::Array)
- return false;
- coder.m_root = WebRenderObject::create(name, elementTagName, elementID, static_pointer_cast<API::Array>(elementClassNames), absolutePosition, frameRect, textSnippet, textLength, static_pointer_cast<API::Array>(children));
- break;
- }
- case API::Object::Type::URL: {
- String string;
- if (!decoder.decode(string))
- return false;
- coder.m_root = API::URL::create(string);
- break;
- }
- case API::Object::Type::URLRequest: {
- WebCore::ResourceRequest request;
- if (!decoder.decode(request))
- return false;
- coder.m_root = API::URLRequest::create(request);
- break;
- }
- case API::Object::Type::URLResponse: {
- WebCore::ResourceResponse response;
- if (!decoder.decode(response))
- return false;
- coder.m_root = API::URLResponse::create(response);
- break;
- }
- case API::Object::Type::UserContentURLPattern: {
- String string;
- if (!decoder.decode(string))
- return false;
- coder.m_root = API::UserContentURLPattern::create(string);
- break;
- }
- case API::Object::Type::Image: {
- bool didEncode = false;
- if (!decoder.decode(didEncode))
- return false;
-
- if (!didEncode)
- break;
-
- ShareableBitmap::Handle handle;
- if (!decoder.decode(handle))
- return false;
-
- coder.m_root = WebImage::create(ShareableBitmap::create(handle));
- return true;
- }
- case API::Object::Type::Data: {
- IPC::DataReference dataReference;
- if (!decoder.decode(dataReference))
- return false;
- coder.m_root = API::Data::create(dataReference.data(), dataReference.size());
- break;
- }
- case API::Object::Type::CertificateInfo: {
- WebCore::CertificateInfo certificateInfo;
- if (!decoder.decode(certificateInfo))
- return false;
- coder.m_root = WebCertificateInfo::create(certificateInfo);
- break;
- }
- case API::Object::Type::Error: {
- WebCore::ResourceError resourceError;
- if (!decoder.decode(resourceError))
- return false;
- coder.m_root = API::Error::create(resourceError);
- break;
- }
- default:
- break;
- }
-
- return true;
- }
-
-protected:
- UserMessageDecoder(RefPtr<API::Object>& root)
- : m_root(root)
- {
- }
-
- RefPtr<API::Object>& m_root;
-};
-
-} // namespace WebKit
-
-#endif // UserMessageCoders_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacObjCObjectGraphCodersh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.h (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.h 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.h 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -1,82 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 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 ObjCObjectGraphCoders_h
-#define ObjCObjectGraphCoders_h
-
-#include "ArgumentDecoder.h"
-#include "ArgumentEncoder.h"
-#include "ObjCObjectGraph.h"
-#include <wtf/RefPtr.h>
-
-namespace WebKit {
-
-class WebProcess;
-class WebProcessProxy;
-
-class WebContextObjCObjectGraphEncoder {
-public:
- explicit WebContextObjCObjectGraphEncoder(ObjCObjectGraph*, WebProcessProxy&);
- void encode(IPC::ArgumentEncoder&) const;
-
-private:
- ObjCObjectGraph* m_objectGraph;
- WebProcessProxy& m_process;
-};
-
-class WebContextObjCObjectGraphDecoder {
-public:
- explicit WebContextObjCObjectGraphDecoder(RefPtr<ObjCObjectGraph>&, WebProcessProxy&);
- static bool decode(IPC::ArgumentDecoder&, WebContextObjCObjectGraphDecoder&);
-
-private:
- RefPtr<ObjCObjectGraph>& m_objectGraph;
- WebProcessProxy& m_process;
-};
-
-
-class InjectedBundleObjCObjectGraphEncoder {
-public:
- explicit InjectedBundleObjCObjectGraphEncoder(ObjCObjectGraph*, WebProcess&);
- void encode(IPC::ArgumentEncoder&) const;
-
-private:
- ObjCObjectGraph* m_objectGraph;
- WebProcess& m_process;
-};
-
-class InjectedBundleObjCObjectGraphDecoder {
-public:
- explicit InjectedBundleObjCObjectGraphDecoder(RefPtr<ObjCObjectGraph>&, WebProcess&);
- static bool decode(IPC::ArgumentDecoder&, InjectedBundleObjCObjectGraphDecoder&);
-
-private:
- RefPtr<ObjCObjectGraph>& m_objectGraph;
- WebProcess& m_process;
-};
-
-} // namespace WebKit
-
-#endif // ObjCObjectGraphCoders_h
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacObjCObjectGraphCodersmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -1,549 +0,0 @@
</span><del>-/*
- * Copyright (C) 2012 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.
- */
-
-#import "config.h"
-#import "ObjCObjectGraphCoders.h"
-
-#import "ArgumentCodersMac.h"
-#import "WKTypeRefWrapper.h"
-
-// For UIProcess side encoding/decoding
-#import "WKAPICast.h"
-#import "WKBrowsingContextControllerInternal.h"
-#import "WebContextUserMessageCoders.h"
-#import "WebPageProxy.h"
-#import "WebProcessProxy.h"
-
-// For WebProcess side encoding/decoding
-#import "InjectedBundleUserMessageCoders.h"
-#import "WKBundleAPICast.h"
-#import "WKWebProcessPlugInBrowserContextControllerInternal.h"
-#import "WKWebProcessPlugInInternal.h"
-#import "WebPage.h"
-#import "WebProcess.h"
-
-namespace WebKit {
-
-enum WebKitNSType {
- NullType,
- NSDictionaryType,
- NSArrayType,
- NSStringType,
- NSNumberType,
- NSDateType,
- NSDataType,
-#if WK_API_ENABLED
- WKBrowsingContextControllerType,
- WKTypeRefWrapperType,
-#endif
- UnknownType,
-};
-
-static WebKitNSType typeFromObject(id object)
-{
- ASSERT(object);
-
- if ([object isKindOfClass:[NSDictionary class]])
- return NSDictionaryType;
- if ([object isKindOfClass:[NSString class]])
- return NSStringType;
- if ([object isKindOfClass:[NSArray class]])
- return NSArrayType;
- if ([object isKindOfClass:[NSNumber class]])
- return NSNumberType;
- if ([object isKindOfClass:[NSDate class]])
- return NSDateType;
- if ([object isKindOfClass:[NSData class]])
- return NSDataType;
-#if WK_API_ENABLED
- if ([object isKindOfClass:[WKBrowsingContextController class]] || [object isKindOfClass:[WKWebProcessPlugInBrowserContextController class]])
- return WKBrowsingContextControllerType;
- if ([object isKindOfClass:[WKTypeRefWrapper class]])
- return WKTypeRefWrapperType;
-#endif
-
- return UnknownType;
-}
-
-template<typename Owner>
-class ObjCObjectGraphEncoder {
-public:
- bool baseEncode(IPC::ArgumentEncoder& encoder, const Owner& coder, WebKitNSType& type) const
- {
- if (!m_root) {
- encoder << static_cast<uint32_t>(NullType);
- return true;
- }
-
- type = typeFromObject(m_root);
- if (type == UnknownType) {
- [NSException raise:NSInvalidArgumentException format:@"Can not encode objects of class type '%@'", static_cast<NSString *>(NSStringFromClass([m_root class]))];
- }
-
- encoder << static_cast<uint32_t>(type);
-
- switch (type) {
- case NSStringType: {
- IPC::encode(encoder, static_cast<NSString *>(m_root));
- return true;
- }
- case NSArrayType: {
- NSArray *array = static_cast<NSArray *>(m_root);
-
- NSUInteger size = [array count];
- encoder << static_cast<uint64_t>(size);
-
- for (NSUInteger i = 0; i < size; ++i)
- encoder << Owner(coder, [array objectAtIndex:i]);
- return true;
- }
- case NSDictionaryType: {
- NSDictionary* dictionary = static_cast<NSDictionary *>(m_root);
-
- NSUInteger size = [dictionary count];
- encoder << static_cast<uint64_t>(size);
-
- NSArray *keys = [dictionary allKeys];
- NSArray *values = [dictionary allValues];
- for (NSUInteger i = 0; i < size; ++i) {
- encoder << Owner(coder, [keys objectAtIndex:i]);
- encoder << Owner(coder, [values objectAtIndex:i]);
- }
-
- return true;
- }
- case NSNumberType: {
- IPC::encode(encoder, static_cast<NSNumber *>(m_root));
- return true;
- }
- case NSDateType: {
- IPC::encode(encoder, static_cast<NSDate *>(m_root));
- return true;
- }
- case NSDataType: {
- IPC::encode(encoder, static_cast<NSData *>(m_root));
- return true;
- }
- default:
- break;
- }
-
- return false;
- }
-
-protected:
- ObjCObjectGraphEncoder(id root)
- : m_root(root)
- {
- }
-
- id m_root;
-};
-
-template<typename Owner>
-class ObjCObjectGraphDecoder {
-public:
- static bool baseDecode(IPC::ArgumentDecoder& decoder, Owner& coder, WebKitNSType& type)
- {
- uint32_t typeAsUInt32;
- if (!decoder.decode(typeAsUInt32))
- return false;
-
- type = static_cast<WebKitNSType>(typeAsUInt32);
-
- switch (type) {
- case NSStringType: {
- RetainPtr<NSString> string;
- if (!IPC::decode(decoder, string))
- return false;
- coder.m_root = string;
- break;
- }
- case NSArrayType: {
- uint64_t size;
- if (!decoder.decode(size))
- return false;
-
- RetainPtr<NSMutableArray> array = adoptNS([[NSMutableArray alloc] initWithCapacity:size]);
- for (uint64_t i = 0; i < size; ++i) {
- RetainPtr<id> value;
- Owner messageCoder(coder, value);
- if (!decoder.decode(messageCoder))
- return false;
-
- [array addObject:value.get()];
- }
-
- coder.m_root = array;
- break;
- }
- case NSDictionaryType: {
- uint64_t size;
- if (!decoder.decode(size))
- return false;
-
- RetainPtr<NSMutableDictionary> dictionary = adoptNS([[NSMutableDictionary alloc] initWithCapacity:size]);
- for (uint64_t i = 0; i < size; ++i) {
- // Try to decode the key name.
- RetainPtr<id> key;
- Owner keyMessageCoder(coder, key);
- if (!decoder.decode(keyMessageCoder))
- return false;
-
- RetainPtr<id> value;
- Owner valueMessageCoder(coder, value);
- if (!decoder.decode(valueMessageCoder))
- return false;
-
- [dictionary setObject:value.get() forKey:key.get()];
- }
-
- coder.m_root = dictionary;
- break;
- }
- case NSNumberType: {
- RetainPtr<NSNumber> number;
- if (!IPC::decode(decoder, number))
- return false;
- coder.m_root = number;
- break;
- }
- case NSDateType: {
- RetainPtr<NSDate> date;
- if (!IPC::decode(decoder, date))
- return false;
- coder.m_root = date;
- break;
- }
- case NSDataType: {
- RetainPtr<NSData> data;
- if (!IPC::decode(decoder, data))
- return false;
- coder.m_root = data;
- break;
- }
- default:
- break;
- }
-
- return true;
- }
-
-protected:
- ObjCObjectGraphDecoder(RetainPtr<id>& root)
- : m_root(root)
- {
- }
-
- RetainPtr<id>& m_root;
-};
-
-
-// ProcessPool Additions
-
-class WebContextObjCObjectGraphEncoderImpl : public ObjCObjectGraphEncoder<WebContextObjCObjectGraphEncoderImpl> {
-public:
- typedef ObjCObjectGraphEncoder<WebContextObjCObjectGraphEncoderImpl> Base;
-
- explicit WebContextObjCObjectGraphEncoderImpl(id root, WebProcessProxy& process)
- : Base(root)
- , m_process(process)
- {
- }
-
- WebContextObjCObjectGraphEncoderImpl(const WebContextObjCObjectGraphEncoderImpl& userMessageEncoder, id root)
- : Base(root)
- , m_process(userMessageEncoder.m_process)
- {
- }
-
- void encode(IPC::ArgumentEncoder& encoder) const
- {
- WebKitNSType type = NullType;
- if (baseEncode(encoder, *this, type))
- return;
-
- switch (type) {
-#if WK_API_ENABLED
- case WKBrowsingContextControllerType: {
- WKBrowsingContextController *browsingContextController = static_cast<WKBrowsingContextController *>(m_root);
-
- encoder << toImpl(browsingContextController._pageRef)->pageID();
- break;
- }
- case WKTypeRefWrapperType: {
- WKTypeRefWrapper *wrapper = static_cast<WKTypeRefWrapper *>(m_root);
- encoder << WebContextUserMessageEncoder(toImpl(wrapper.object), m_process);
- break;
- }
-#endif
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- }
-
-private:
- WebProcessProxy& m_process;
-};
-
-
-class WebContextObjCObjectGraphDecoderImpl : public ObjCObjectGraphDecoder<WebContextObjCObjectGraphDecoderImpl> {
-public:
- typedef ObjCObjectGraphDecoder<WebContextObjCObjectGraphDecoderImpl> Base;
-
- WebContextObjCObjectGraphDecoderImpl(RetainPtr<id>& root, WebProcessProxy& process)
- : Base(root)
- , m_process(process)
- {
- }
-
- WebContextObjCObjectGraphDecoderImpl(WebContextObjCObjectGraphDecoderImpl& userMessageDecoder, RetainPtr<id>& root)
- : Base(root)
- , m_process(userMessageDecoder.m_process)
- {
- }
-
- static bool decode(IPC::ArgumentDecoder& decoder, WebContextObjCObjectGraphDecoderImpl& coder)
- {
- WebKitNSType type = NullType;
- if (!Base::baseDecode(decoder, coder, type))
- return false;
-
- if (coder.m_root)
- return true;
-
- if (type == NullType || type == UnknownType) {
- coder.m_root = [NSNull null];
- return true;
- }
-
- switch (type) {
-#if WK_API_ENABLED
- case WKBrowsingContextControllerType: {
- uint64_t pageID;
- if (!decoder.decode(pageID))
- return false;
-
- WebPageProxy* webPage = coder.m_process.webPage(pageID);
- if (!webPage)
- coder.m_root = [NSNull null];
- else
- coder.m_root = [WKBrowsingContextController _browsingContextControllerForPageRef:toAPI(webPage)];
- break;
- }
- case WKTypeRefWrapperType: {
- RefPtr<API::Object> object;
- WebContextUserMessageDecoder objectDecoder(object, coder.m_process);
- if (!decoder.decode(objectDecoder))
- return false;
- coder.m_root = adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(object.get())]);
- break;
- }
-#endif
- default:
- return false;
- }
-
- return true;
- }
-
-private:
- WebProcessProxy& m_process;
-};
-
-
-// InjectedBundle Additions
-
-class InjectedBundleObjCObjectGraphEncoderImpl : public ObjCObjectGraphEncoder<InjectedBundleObjCObjectGraphEncoderImpl> {
-public:
- typedef ObjCObjectGraphEncoder<InjectedBundleObjCObjectGraphEncoderImpl> Base;
-
- explicit InjectedBundleObjCObjectGraphEncoderImpl(id root, WebProcess& process)
- : Base(root)
- , m_process(process)
- {
- }
-
- explicit InjectedBundleObjCObjectGraphEncoderImpl(const InjectedBundleObjCObjectGraphEncoderImpl& encoder, id root)
- : Base(root)
- , m_process(encoder.m_process)
- {
- }
-
- void encode(IPC::ArgumentEncoder& encoder) const
- {
- WebKitNSType type = NullType;
- if (baseEncode(encoder, *this, type))
- return;
-
- switch (type) {
-#if WK_API_ENABLED
- case WKBrowsingContextControllerType: {
- WKWebProcessPlugInBrowserContextController *browserContextController = static_cast<WKWebProcessPlugInBrowserContextController *>(m_root);
-
- encoder << toImpl(browserContextController._bundlePageRef)->pageID();
- break;
- }
- case WKTypeRefWrapperType: {
- WKTypeRefWrapper *wrapper = static_cast<WKTypeRefWrapper *>(m_root);
- encoder << InjectedBundleUserMessageEncoder(toImpl(wrapper.object));
- break;
- }
-#endif
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- }
-
-private:
- WebProcess& m_process;
-};
-
-class InjectedBundleObjCObjectGraphDecoderImpl : public ObjCObjectGraphDecoder<InjectedBundleObjCObjectGraphDecoderImpl> {
-public:
- typedef ObjCObjectGraphDecoder<InjectedBundleObjCObjectGraphDecoderImpl> Base;
-
- InjectedBundleObjCObjectGraphDecoderImpl(RetainPtr<id>& root, WebProcess& process)
- : Base(root)
- , m_process(process)
- {
- }
-
- InjectedBundleObjCObjectGraphDecoderImpl(InjectedBundleObjCObjectGraphDecoderImpl& userMessageDecoder, RetainPtr<id>& root)
- : Base(root)
- , m_process(userMessageDecoder.m_process)
- {
- }
-
- static bool decode(IPC::ArgumentDecoder& decoder, InjectedBundleObjCObjectGraphDecoderImpl& coder)
- {
- WebKitNSType type = NullType;
- if (!Base::baseDecode(decoder, coder, type))
- return false;
-
- if (coder.m_root)
- return true;
-
- if (type == NullType || type == UnknownType) {
- coder.m_root = [NSNull null];
- return true;
- }
-
- switch (type) {
-#if WK_API_ENABLED
- case WKBrowsingContextControllerType: {
- uint64_t pageID;
- if (!decoder.decode(pageID))
- return false;
-
- WebPage* webPage = coder.m_process.webPage(pageID);
- if (!webPage)
- coder.m_root = [NSNull null];
- else
- coder.m_root = wrapper(*webPage);
- break;
- }
- case WKTypeRefWrapperType: {
- RefPtr<API::Object> object;
- InjectedBundleUserMessageDecoder objectDecoder(object);
- if (!decoder.decode(objectDecoder))
- return false;
- coder.m_root = adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(object.get())]);
- break;
- }
-#endif
- default:
- return false;
- }
-
- return true;
- }
-
-private:
- WebProcess& m_process;
-};
-
-
-// Adaptors
-
-WebContextObjCObjectGraphEncoder::WebContextObjCObjectGraphEncoder(ObjCObjectGraph* objectGraph, WebProcessProxy& process)
- : m_objectGraph(objectGraph)
- , m_process(process)
-{
-}
-
-void WebContextObjCObjectGraphEncoder::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << WebContextObjCObjectGraphEncoderImpl(m_objectGraph->rootObject(), m_process);
-}
-
-WebContextObjCObjectGraphDecoder::WebContextObjCObjectGraphDecoder(RefPtr<ObjCObjectGraph>& objectGraph, WebProcessProxy& process)
- : m_objectGraph(objectGraph)
- , m_process(process)
-{
-}
-
-bool WebContextObjCObjectGraphDecoder::decode(IPC::ArgumentDecoder& decoder, WebContextObjCObjectGraphDecoder& coder)
-{
- RetainPtr<id> root;
- WebContextObjCObjectGraphDecoderImpl coderImpl(root, coder.m_process);
- if (!decoder.decode(coderImpl))
- return false;
-
- coder.m_objectGraph = ObjCObjectGraph::create(root.get());
- return true;
-}
-
-InjectedBundleObjCObjectGraphEncoder::InjectedBundleObjCObjectGraphEncoder(ObjCObjectGraph* objectGraph, WebProcess& process)
- : m_objectGraph(objectGraph)
- , m_process(process)
-{
-}
-
-void InjectedBundleObjCObjectGraphEncoder::encode(IPC::ArgumentEncoder& encoder) const
-{
- encoder << InjectedBundleObjCObjectGraphEncoderImpl(m_objectGraph->rootObject(), m_process);
-}
-
-InjectedBundleObjCObjectGraphDecoder::InjectedBundleObjCObjectGraphDecoder(RefPtr<ObjCObjectGraph>& objectGraph, WebProcess& process)
- : m_objectGraph(objectGraph)
- , m_process(process)
-{
-}
-
-bool InjectedBundleObjCObjectGraphDecoder::decode(IPC::ArgumentDecoder& decoder, InjectedBundleObjCObjectGraphDecoder& coder)
-{
- RetainPtr<id> root;
- InjectedBundleObjCObjectGraphDecoderImpl coderImpl(root, coder.m_process);
- if (!decoder.decode(coderImpl))
- return false;
-
- coder.m_objectGraph = ObjCObjectGraph::create(root.get());
- return true;
-}
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "WebConnectionToWebProcess.h"
</span><span class="cx">
</span><span class="cx"> #include "WebConnectionMessages.h"
</span><del>-#include "WebContextUserMessageCoders.h"
</del><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextUserMessageCodersh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -1,171 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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 "UserMessageCoders.h"
-#include "WebFrameProxy.h"
-#include "WebPageGroup.h"
-#include "WebPageGroupData.h"
-#include "WebPageProxy.h"
-
-#if PLATFORM(COCOA)
-#include "ObjCObjectGraphCoders.h"
-#endif
-
-namespace WebKit {
-
-// Adds
-// - Page -> BundlePage
-// - Frame -> BundleFrame
-// - PageGroup -> BundlePageGroup
-
-class WebContextUserMessageEncoder : public UserMessageEncoder<WebContextUserMessageEncoder> {
-public:
- typedef UserMessageEncoder<WebContextUserMessageEncoder> Base;
-
- explicit WebContextUserMessageEncoder(API::Object* root, WebProcessProxy& process)
- : Base(root)
- , m_process(process)
- {
- }
-
- WebContextUserMessageEncoder(const WebContextUserMessageEncoder& userMessageEncoder, API::Object* root)
- : Base(root)
- , m_process(userMessageEncoder.m_process)
- {
- }
-
- void encode(IPC::ArgumentEncoder& encoder) const
- {
- API::Object::Type type = API::Object::Type::Null;
- if (baseEncode(encoder, *this, type))
- return;
-
- switch (type) {
- case API::Object::Type::Page: {
- WebPageProxy* page = static_cast<WebPageProxy*>(m_root);
- encoder << page->pageID();
- break;
- }
- case API::Object::Type::Frame: {
- WebFrameProxy* frame = static_cast<WebFrameProxy*>(m_root);
- encoder << frame->frameID();
- break;
- }
- case API::Object::Type::PageGroup: {
- WebPageGroup* pageGroup = static_cast<WebPageGroup*>(m_root);
- encoder << pageGroup->data();
- break;
- }
-#if PLATFORM(COCOA)
- case API::Object::Type::ObjCObjectGraph: {
- ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
- encoder << WebContextObjCObjectGraphEncoder(objectGraph, m_process);
- break;
- }
-#endif
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- }
-
-private:
- WebProcessProxy& m_process;
-};
-
-// Adds
-// - Page -> BundlePage
-// - Frame -> BundleFrame
-// - PageGroup -> BundlePageGroup
-
-class WebContextUserMessageDecoder : public UserMessageDecoder<WebContextUserMessageDecoder> {
-public:
- typedef UserMessageDecoder<WebContextUserMessageDecoder> Base;
-
- WebContextUserMessageDecoder(RefPtr<API::Object>& root, WebProcessProxy& process)
- : Base(root)
- , m_process(process)
- {
- }
-
- WebContextUserMessageDecoder(WebContextUserMessageDecoder& userMessageDecoder, RefPtr<API::Object>& root)
- : Base(root)
- , m_process(userMessageDecoder.m_process)
- {
- }
-
- static bool decode(IPC::ArgumentDecoder& decoder, WebContextUserMessageDecoder& coder)
- {
- API::Object::Type type = API::Object::Type::Null;
- if (!Base::baseDecode(decoder, coder, type))
- return false;
-
- if (coder.m_root || type == API::Object::Type::Null)
- return true;
-
- switch (type) {
- case API::Object::Type::BundlePage: {
- uint64_t pageID;
- if (!decoder.decode(pageID))
- return false;
- coder.m_root = coder.m_process.webPage(pageID);
- break;
- }
- case API::Object::Type::BundleFrame: {
- uint64_t frameID;
- if (!decoder.decode(frameID))
- return false;
- coder.m_root = coder.m_process.webFrame(frameID);
- break;
- }
- case API::Object::Type::BundlePageGroup: {
- uint64_t pageGroupID;
- if (!decoder.decode(pageGroupID))
- return false;
- coder.m_root = WebPageGroup::get(pageGroupID);
- break;
- }
-#if PLATFORM(COCOA)
- case API::Object::Type::ObjCObjectGraph: {
- RefPtr<ObjCObjectGraph> objectGraph;
- WebContextObjCObjectGraphDecoder objectGraphDecoder(objectGraph, coder.m_process);
- if (!decoder.decode(objectGraphDecoder))
- return false;
- coder.m_root = objectGraph.get();
- break;
- }
-#endif
- default:
- return false;
- }
-
- return true;
- }
-
-private:
- WebProcessProxy& m_process;
-};
-
-} // namespace WebKit
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "APIArray.h"
</span><span class="cx"> #include "APIFindClient.h"
</span><span class="cx"> #include "APIFormClient.h"
</span><ins>+#include "APIGeometry.h"
</ins><span class="cx"> #include "APILegacyContextHistoryClient.h"
</span><span class="cx"> #include "APILoaderClient.h"
</span><span class="cx"> #include "APIPolicyClient.h"
</span><span class="lines">@@ -62,7 +63,6 @@
</span><span class="cx"> #include "WebBackForwardListItem.h"
</span><span class="cx"> #include "WebCertificateInfo.h"
</span><span class="cx"> #include "WebContextMenuProxy.h"
</span><del>-#include "WebContextUserMessageCoders.h"
</del><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebEditCommandProxy.h"
</span><span class="cx"> #include "WebEvent.h"
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> #include "WebFramePolicyListenerProxy.h"
</span><span class="cx"> #include "WebFullScreenManagerProxy.h"
</span><span class="cx"> #include "WebFullScreenManagerProxyMessages.h"
</span><ins>+#include "WebImage.h"
</ins><span class="cx"> #include "WebInspectorProxy.h"
</span><span class="cx"> #include "WebInspectorProxyMessages.h"
</span><span class="cx"> #include "WebNotificationManagerProxy.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> #include "TextChecker.h"
</span><span class="cx"> #include "WKContextPrivate.h"
</span><span class="cx"> #include "WebApplicationCacheManagerProxy.h"
</span><ins>+#include "WebCertificateInfo.h"
</ins><span class="cx"> #include "WebContextSupplement.h"
</span><del>-#include "WebContextUserMessageCoders.h"
</del><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebDatabaseManagerProxy.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -1415,8 +1415,6 @@
</span><span class="cx"> BC8A501511765F5600757573 /* WKRetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8A501411765F5600757573 /* WKRetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC8ACA1316670D89004C1941 /* ObjCObjectGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8ACA0F16670D7A004C1941 /* ObjCObjectGraph.h */; };
</span><span class="cx"> BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8ACA1016670D7B004C1941 /* ObjCObjectGraph.mm */; };
</span><del>- BC8ACA1516670D89004C1941 /* ObjCObjectGraphCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8ACA1116670D7E004C1941 /* ObjCObjectGraphCoders.h */; };
- BC8ACA1616670D89004C1941 /* ObjCObjectGraphCoders.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8ACA1216670D83004C1941 /* ObjCObjectGraphCoders.mm */; };
</del><span class="cx"> BC8F2F2A16273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8F2F2816273A2B005FACB5 /* WKWebProcessPlugInBrowserContextController.mm */; };
</span><span class="cx"> BC8F2F2B16273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8F2F2916273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC8F2F2E16273ACC005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8F2F2D16273ACB005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h */; };
</span><span class="lines">@@ -1449,9 +1447,6 @@
</span><span class="cx"> BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><span class="cx"> BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><span class="cx"> BCAF362216CA292B00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</span><del>- BCB0B0DC12305A2500B1341E /* WebContextUserMessageCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0B0DB12305A2500B1341E /* WebContextUserMessageCoders.h */; };
- BCB0B0DE12305A8C00B1341E /* InjectedBundleUserMessageCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0B0DD12305A8C00B1341E /* InjectedBundleUserMessageCoders.h */; };
- BCB0B0E012305AB100B1341E /* UserMessageCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */; };
</del><span class="cx"> BCB63478116BF10600603215 /* WebKit2_C.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB63477116BF10600603215 /* WebKit2_C.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCB9E24B1120E15C00A137E0 /* WKContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB9E2491120E15C00A137E0 /* WKContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCB9E24C1120E15C00A137E0 /* WKContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB9E24A1120E15C00A137E0 /* WKContext.cpp */; };
</span><span class="lines">@@ -3536,8 +3531,6 @@
</span><span class="cx"> BC8A501411765F5600757573 /* WKRetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRetainPtr.h; sourceTree = "<group>"; };
</span><span class="cx"> BC8ACA0F16670D7A004C1941 /* ObjCObjectGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCObjectGraph.h; sourceTree = "<group>"; };
</span><span class="cx"> BC8ACA1016670D7B004C1941 /* ObjCObjectGraph.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ObjCObjectGraph.mm; sourceTree = "<group>"; };
</span><del>- BC8ACA1116670D7E004C1941 /* ObjCObjectGraphCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCObjectGraphCoders.h; sourceTree = "<group>"; };
- BC8ACA1216670D83004C1941 /* ObjCObjectGraphCoders.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ObjCObjectGraphCoders.mm; sourceTree = "<group>"; };
</del><span class="cx"> BC8F2F2816273A2B005FACB5 /* WKWebProcessPlugInBrowserContextController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugInBrowserContextController.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC8F2F2916273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInBrowserContextController.h; sourceTree = "<group>"; };
</span><span class="cx"> BC8F2F2D16273ACB005FACB5 /* WKWebProcessPlugInBrowserContextControllerInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebProcessPlugInBrowserContextControllerInternal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3570,9 +3563,6 @@
</span><span class="cx"> BCACC44016B24CAA00B6E092 /* Info-OSX.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
</span><span class="cx"> BCACC44316B24CAA00B6E092 /* Info-OSX.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Info-OSX.plist"; sourceTree = "<group>"; };
</span><span class="cx"> BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</span><del>- BCB0B0DB12305A2500B1341E /* WebContextUserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebContextUserMessageCoders.h; sourceTree = "<group>"; };
- BCB0B0DD12305A8C00B1341E /* InjectedBundleUserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleUserMessageCoders.h; sourceTree = "<group>"; };
- BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageCoders.h; sourceTree = "<group>"; };
</del><span class="cx"> BCB63477116BF10600603215 /* WebKit2_C.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2_C.h; sourceTree = "<group>"; };
</span><span class="cx"> BCB86F4B116AAACD00CE20B7 /* WebKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> BCB9E2491120E15C00A137E0 /* WKContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContext.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4537,7 +4527,6 @@
</span><span class="cx"> 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */,
</span><span class="cx"> 1AC1336518565B5700F3EC05 /* UserData.cpp */,
</span><span class="cx"> 1AC1336618565B5700F3EC05 /* UserData.h */,
</span><del>- BCB0B0DF12305AB100B1341E /* UserMessageCoders.h */,
</del><span class="cx"> 2684054A18B866FF0022C38B /* VisibleContentRectUpdateInfo.cpp */,
</span><span class="cx"> 2684054218B85A630022C38B /* VisibleContentRectUpdateInfo.h */,
</span><span class="cx"> 1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */,
</span><span class="lines">@@ -5939,7 +5928,6 @@
</span><span class="cx"> 51A84CE2127F386B00CA6EA4 /* WebContextMenuProxy.cpp */,
</span><span class="cx"> 51ACBB81127A8BAD00D203B9 /* WebContextMenuProxy.h */,
</span><span class="cx"> BCF4DE24168FA44800C94AFC /* WebContextSupplement.h */,
</span><del>- BCB0B0DB12305A2500B1341E /* WebContextUserMessageCoders.h */,
</del><span class="cx"> 330934521315B9750097A7BC /* WebCookieManagerProxy.cpp */,
</span><span class="cx"> 330934531315B9750097A7BC /* WebCookieManagerProxy.h */,
</span><span class="cx"> 330934541315B9750097A7BC /* WebCookieManagerProxy.messages.in */,
</span><span class="lines">@@ -6228,8 +6216,6 @@
</span><span class="cx"> DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */,
</span><span class="cx"> BC8ACA0F16670D7A004C1941 /* ObjCObjectGraph.h */,
</span><span class="cx"> BC8ACA1016670D7B004C1941 /* ObjCObjectGraph.mm */,
</span><del>- BC8ACA1116670D7E004C1941 /* ObjCObjectGraphCoders.h */,
- BC8ACA1216670D83004C1941 /* ObjCObjectGraphCoders.mm */,
</del><span class="cx"> C574A57F12E66681002DFE98 /* PasteboardTypes.h */,
</span><span class="cx"> C574A58012E66681002DFE98 /* PasteboardTypes.mm */,
</span><span class="cx"> E19582D2153CBFD700B60875 /* PDFKitImports.h */,
</span><span class="lines">@@ -6315,7 +6301,6 @@
</span><span class="cx"> BCA8C6AE11E3C08700812FB7 /* InjectedBundlePageUIClient.h */,
</span><span class="cx"> BC14DF76120B5B7900826C0C /* InjectedBundleScriptWorld.cpp */,
</span><span class="cx"> BC14DF75120B5B7900826C0C /* InjectedBundleScriptWorld.h */,
</span><del>- BCB0B0DD12305A8C00B1341E /* InjectedBundleUserMessageCoders.h */,
</del><span class="cx"> );
</span><span class="cx"> path = InjectedBundle;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -7380,7 +7365,6 @@
</span><span class="cx"> BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */,
</span><span class="cx"> BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */,
</span><span class="cx"> BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
</span><del>- BCB0B0DE12305A8C00B1341E /* InjectedBundleUserMessageCoders.h in Headers */,
</del><span class="cx"> C58CDF2E1887609F00871536 /* InteractionInformationAtPosition.h in Headers */,
</span><span class="cx"> C58CDF2A1887548B00871536 /* InteractionInformationAtPosition.h in Headers */,
</span><span class="cx"> 1AE49A4911FFA8CE0048B464 /* JSNPMethod.h in Headers */,
</span><span class="lines">@@ -7449,7 +7433,6 @@
</span><span class="cx"> 1A2162B111F38971008AD0F5 /* NPRuntimeUtilities.h in Headers */,
</span><span class="cx"> 1A2D84A3127F6AD1001EB962 /* NPVariantData.h in Headers */,
</span><span class="cx"> BC8ACA1316670D89004C1941 /* ObjCObjectGraph.h in Headers */,
</span><del>- BC8ACA1516670D89004C1941 /* ObjCObjectGraphCoders.h in Headers */,
</del><span class="cx"> BCCF672D12C7EDF7008F9C35 /* OriginAndDatabases.h in Headers */,
</span><span class="cx"> 7CF47FFB17275C57008ACB91 /* PageBanner.h in Headers */,
</span><span class="cx"> BC6EDAA6111271C600E7678B /* PageClient.h in Headers */,
</span><span class="lines">@@ -7562,7 +7545,6 @@
</span><span class="cx"> 1AC1336818565B5700F3EC05 /* UserData.h in Headers */,
</span><span class="cx"> 4A3CC18B19B0640F00D14AEF /* UserMediaPermissionRequestManagerProxy.h in Headers */,
</span><span class="cx"> 4A3CC18D19B0641900D14AEF /* UserMediaPermissionRequestProxy.h in Headers */,
</span><del>- BCB0B0E012305AB100B1341E /* UserMessageCoders.h in Headers */,
</del><span class="cx"> 2D125C5E1857EA05003BA3CB /* ViewGestureController.h in Headers */,
</span><span class="cx"> 2D1B5D5E185869C8006C6596 /* ViewGestureControllerMessages.h in Headers */,
</span><span class="cx"> 2D819BA21862800E001F03D1 /* ViewGestureGeometryCollectorMessages.h in Headers */,
</span><span class="lines">@@ -7602,7 +7584,6 @@
</span><span class="cx"> 51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */,
</span><span class="cx"> 51ACBBA0127A8F2C00D203B9 /* WebContextMenuProxyMac.h in Headers */,
</span><span class="cx"> BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */,
</span><del>- BCB0B0DC12305A2500B1341E /* WebContextUserMessageCoders.h in Headers */,
</del><span class="cx"> 330934501315B94D0097A7BC /* WebCookieManager.h in Headers */,
</span><span class="cx"> 330934481315B9220097A7BC /* WebCookieManagerMessages.h in Headers */,
</span><span class="cx"> 330934561315B9750097A7BC /* WebCookieManagerProxy.h in Headers */,
</span><span class="lines">@@ -9145,7 +9126,6 @@
</span><span class="cx"> 1A2D84A4127F6AD1001EB962 /* NPVariantData.cpp in Sources */,
</span><span class="cx"> 7C4694C91A4B4EA100AD5845 /* WebPasteboardProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */,
</span><del>- BC8ACA1616670D89004C1941 /* ObjCObjectGraphCoders.mm in Sources */,
</del><span class="cx"> BCCF673312C7F15C008F9C35 /* OriginAndDatabases.cpp in Sources */,
</span><span class="cx"> 7C387434172F5615001BD88A /* PageBanner.cpp in Sources */,
</span><span class="cx"> 7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "InjectedBundleScriptWorld.h"
</span><del>-#include "InjectedBundleUserMessageCoders.h"
</del><span class="cx"> #include "NotificationPermissionRequestManager.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "UserData.h"
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebFrameNetworkingContext.h"
</span><span class="cx"> #include "WebPage.h"
</span><ins>+#include "WebPageGroupProxy.h"
</ins><span class="cx"> #include "WebPreferencesKeys.h"
</span><span class="cx"> #include "WebPreferencesStore.h"
</span><span class="cx"> #include "WebProcess.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleUserMessageCodersh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -1,167 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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 InjectedBundleUserMessageCoders_h
-#define InjectedBundleUserMessageCoders_h
-
-#include "UserMessageCoders.h"
-#include "WebFrame.h"
-#include "WebPage.h"
-#include "WebPageGroupData.h"
-#include "WebPageGroupProxy.h"
-#include "WebProcess.h"
-
-#if PLATFORM(COCOA)
-#include "ObjCObjectGraphCoders.h"
-#endif
-
-namespace WebKit {
-
-// Adds
-// - BundlePage -> Page
-// - BundleFrame -> Frame
-// - BundlePageGroup -> PageGroup
-
-class InjectedBundleUserMessageEncoder : public UserMessageEncoder<InjectedBundleUserMessageEncoder> {
-public:
- typedef UserMessageEncoder<InjectedBundleUserMessageEncoder> Base;
-
- InjectedBundleUserMessageEncoder(API::Object* root)
- : Base(root)
- {
- }
-
- InjectedBundleUserMessageEncoder(const InjectedBundleUserMessageEncoder&, API::Object* root)
- : Base(root)
- {
- }
-
- void encode(IPC::ArgumentEncoder& encoder) const
- {
- API::Object::Type type = API::Object::Type::Null;
- if (baseEncode(encoder, *this, type))
- return;
-
- switch (type) {
- case API::Object::Type::BundlePage: {
- WebPage* page = static_cast<WebPage*>(m_root);
- encoder << page->pageID();
- break;
- }
- case API::Object::Type::BundleFrame: {
- WebFrame* frame = static_cast<WebFrame*>(m_root);
- encoder << frame->frameID();
- break;
- }
- case API::Object::Type::BundlePageGroup: {
- WebPageGroupProxy* pageGroup = static_cast<WebPageGroupProxy*>(m_root);
- encoder << pageGroup->pageGroupID();
- break;
- }
-#if PLATFORM(COCOA)
- case API::Object::Type::ObjCObjectGraph: {
- ObjCObjectGraph* objectGraph = static_cast<ObjCObjectGraph*>(m_root);
- encoder << InjectedBundleObjCObjectGraphEncoder(objectGraph, WebProcess::shared());
- break;
- }
-#endif
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- }
-};
-
-// Adds
-// - Page -> BundlePage
-// - Frame -> BundleFrame
-// - PageGroup -> BundlePageGroup
-
-class InjectedBundleUserMessageDecoder : public UserMessageDecoder<InjectedBundleUserMessageDecoder> {
-public:
- typedef UserMessageDecoder<InjectedBundleUserMessageDecoder> Base;
-
- InjectedBundleUserMessageDecoder(RefPtr<API::Object>& root)
- : Base(root)
- {
- }
-
- InjectedBundleUserMessageDecoder(InjectedBundleUserMessageDecoder&, RefPtr<API::Object>& root)
- : Base(root)
- {
- }
-
- static bool decode(IPC::ArgumentDecoder& decoder, InjectedBundleUserMessageDecoder& coder)
- {
- API::Object::Type type = API::Object::Type::Null;
- if (!Base::baseDecode(decoder, coder, type))
- return false;
-
- if (coder.m_root || type == API::Object::Type::Null)
- return true;
-
- switch (type) {
- case API::Object::Type::Page: {
- uint64_t pageID;
- if (!decoder.decode(pageID))
- return false;
- coder.m_root = WebProcess::shared().webPage(pageID);
- break;
- }
- case API::Object::Type::Frame: {
- uint64_t frameID;
- if (!decoder.decode(frameID))
- return false;
- coder.m_root = WebProcess::shared().webFrame(frameID);
- break;
- }
- case API::Object::Type::PageGroup: {
- WebPageGroupData pageGroupData;
- if (!decoder.decode(pageGroupData))
- return false;
- coder.m_root = WebProcess::shared().webPageGroup(pageGroupData);
- break;
- }
-#if PLATFORM(COCOA)
- case API::Object::Type::ObjCObjectGraph: {
- RefPtr<ObjCObjectGraph> objectGraph;
- InjectedBundleObjCObjectGraphDecoder objectGraphDecoder(objectGraph, WebProcess::shared());
- if (!decoder.decode(objectGraphDecoder))
- return false;
- coder.m_root = objectGraph.get();
- break;
- }
-#endif
- default:
- return false;
- }
-
- return true;
- }
-};
-
-} // namespace WebKit
-
-#endif // InjectedBundleUserMessageCoders_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebConnectionToUIProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebConnectionToUIProcess.h"
</span><span class="cx">
</span><del>-#include "InjectedBundleUserMessageCoders.h"
</del><span class="cx"> #include "WebConnectionMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "APISecurityOrigin.h"
</span><span class="cx"> #include "DrawingArea.h"
</span><span class="cx"> #include "InjectedBundleNavigationAction.h"
</span><del>-#include "InjectedBundleUserMessageCoders.h"
</del><span class="cx"> #include "LayerTreeHost.h"
</span><span class="cx"> #include "NavigationActionData.h"
</span><span class="cx"> #include "PageBanner.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "InjectedBundleBackForwardListItem.h"
</span><span class="cx"> #include "InjectedBundleDOMWindowExtension.h"
</span><span class="cx"> #include "InjectedBundleNavigationAction.h"
</span><del>-#include "InjectedBundleUserMessageCoders.h"
</del><span class="cx"> #include "NavigationActionData.h"
</span><span class="cx"> #include "PluginView.h"
</span><span class="cx"> #include "UserData.h"
</span><span class="lines">@@ -49,6 +48,7 @@
</span><span class="cx"> #include "WebIconDatabaseMessages.h"
</span><span class="cx"> #include "WebNavigationDataStore.h"
</span><span class="cx"> #include "WebPage.h"
</span><ins>+#include "WebPageGroupProxy.h"
</ins><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -27,12 +27,12 @@
</span><span class="cx">
</span><span class="cx"> #include "ContextMenuContextData.h"
</span><span class="cx"> #include "InjectedBundleHitTestResult.h"
</span><del>-#include "InjectedBundleUserMessageCoders.h"
</del><span class="cx"> #include "UserData.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebHitTestResult.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><ins>+#include "WebProcess.h"
</ins><span class="cx"> #include <WebCore/ContextMenu.h>
</span><span class="cx"> #include <WebCore/ContextMenuController.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx">
</span><ins>+#include "APIGeometry.h"
</ins><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DragControllerAction.h"
</span><span class="lines">@@ -38,7 +39,6 @@
</span><span class="cx"> #include "EventDispatcher.h"
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx"> #include "InjectedBundleBackForwardList.h"
</span><del>-#include "InjectedBundleUserMessageCoders.h"
</del><span class="cx"> #include "LayerTreeHost.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetscapePlugin.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #import "EditingRange.h"
</span><span class="cx"> #import "EditorState.h"
</span><span class="cx"> #import "InjectedBundleHitTestResult.h"
</span><del>-#import "InjectedBundleUserMessageCoders.h"
</del><span class="cx"> #import "PDFKitImports.h"
</span><span class="cx"> #import "PageBanner.h"
</span><span class="cx"> #import "PluginView.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177805 => 177806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-29 19:35:48 UTC (rev 177805)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-29 19:38:19 UTC (rev 177806)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "DrawingArea.h"
</span><span class="cx"> #include "EventDispatcher.h"
</span><span class="cx"> #include "InjectedBundle.h"
</span><del>-#include "InjectedBundleUserMessageCoders.h"
</del><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "PluginProcessConnectionManager.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="lines">@@ -53,7 +52,7 @@
</span><span class="cx"> #include "WebMemorySampler.h"
</span><span class="cx"> #include "WebOriginDataManager.h"
</span><span class="cx"> #include "WebPage.h"
</span><del>-#include "WebPageGroup.h"
</del><ins>+#include "WebPageGroupProxy.h"
</ins><span class="cx"> #include "WebPageGroupProxyMessages.h"
</span><span class="cx"> #include "WebPlatformStrategies.h"
</span><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="lines">@@ -94,6 +93,10 @@
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#include "ObjCObjectGraph.h"
+#endif
+
</ins><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "CookieStorageShim.h"
</span></span></pre>
</div>
</div>
</body>
</html>