diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-09-23 11:12:41 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-27 15:06:54 +0000 |
commit | aeadc50e2c2efdde82e246a82f0b7983d1801805 (patch) | |
tree | a34703965ea501325cef5f554fb5495bdd522b36 /src/core/web_channel_ipc_transport_host.cpp | |
parent | 65c264f58969281392d4a4b42b35be9a352c7f7e (diff) |
Cleanup directory structure
The src/core/renderer directory is meant to contain files that would be
in the renderer process and the chrome/renderer subdirectory in chromium,
but a few classes from the browser process and the renderer_host dir
has snuck in.
This patch cleans up the structure so that classes in the browser that
serves as host classes for renderer classes goes in renderer_host.
Change-Id: I9333b1322e2246d4da9b4e8cfe6be604f6d996bf
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/web_channel_ipc_transport_host.cpp')
-rw-r--r-- | src/core/web_channel_ipc_transport_host.cpp | 105 |
1 files changed, 0 insertions, 105 deletions
diff --git a/src/core/web_channel_ipc_transport_host.cpp b/src/core/web_channel_ipc_transport_host.cpp deleted file mode 100644 index aef16f0a0..000000000 --- a/src/core/web_channel_ipc_transport_host.cpp +++ /dev/null @@ -1,105 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "web_channel_ipc_transport_host.h" - -#include "base/strings/string16.h" - -#include "common/qt_messages.h" -#include "type_conversion.h" - -#include <QJsonDocument> -#include <QJsonObject> - -namespace QtWebEngineCore { - -WebChannelIPCTransportHost::WebChannelIPCTransportHost(content::WebContents *contents, uint worldId, QObject *parent) - : QWebChannelAbstractTransport(parent) - , content::WebContentsObserver(contents) - , m_worldId(worldId) -{ - Send(new WebChannelIPCTransport_Install(routing_id(), m_worldId)); -} - -WebChannelIPCTransportHost::~WebChannelIPCTransportHost() -{ -} - -void WebChannelIPCTransportHost::RenderViewHostChanged(content::RenderViewHost *, content::RenderViewHost *) -{ - // This means that we were moved into a different RenderView, possibly in a different - // render process and that we lost our WebChannelIPCTransport object and its state. - Send(new WebChannelIPCTransport_Install(routing_id(), m_worldId)); -} - -void WebChannelIPCTransportHost::setWorldId(uint worldId) -{ - if (worldId == m_worldId) - return; - Send(new WebChannelIPCTransport_Uninstall(routing_id(), m_worldId)); - m_worldId = worldId; - Send(new WebChannelIPCTransport_Install(routing_id(), m_worldId)); -} - -void WebChannelIPCTransportHost::sendMessage(const QJsonObject &message) -{ - QJsonDocument doc(message); - int size = 0; - const char *rawData = doc.rawData(&size); - Send(new WebChannelIPCTransport_Message(routing_id(), std::vector<char>(rawData, rawData + size), m_worldId)); -} - -void WebChannelIPCTransportHost::onWebChannelMessage(const std::vector<char> &message) -{ - QJsonDocument doc = QJsonDocument::fromRawData(message.data(), message.size(), QJsonDocument::BypassValidation); - Q_ASSERT(doc.isObject()); - Q_EMIT messageReceived(doc.object(), this); -} - -bool WebChannelIPCTransportHost::OnMessageReceived(const IPC::Message &message) -{ - bool handled = true; - IPC_BEGIN_MESSAGE_MAP(WebChannelIPCTransportHost, message) - IPC_MESSAGE_HANDLER(WebChannelIPCTransportHost_SendMessage, onWebChannelMessage) - IPC_MESSAGE_UNHANDLED(handled = false) - IPC_END_MESSAGE_MAP() - return handled; -} - -} // namespace |