From c470b7362cc19fa0d6d20ab8ddff0eb787cf7763 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 3 May 2018 13:56:59 +0200
Subject: Reduce boilerplate code for WebContentsAdapter

We do not need WebContentsAdapterPrivate.
Remove it.

This change also removes scoped ref to WebEngineContext
in WebContentsAdapter.

Change-Id: I0a9acec4d5500342ffa41865cfc775fdb0e68ac4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/web_contents_adapter_p.h | 109 --------------------------------------
 1 file changed, 109 deletions(-)
 delete mode 100644 src/core/web_contents_adapter_p.h

(limited to 'src/core/web_contents_adapter_p.h')

diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h
deleted file mode 100644
index 5b902fc94..000000000
--- a/src/core/web_contents_adapter_p.h
+++ /dev/null
@@ -1,109 +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$
-**
-****************************************************************************/
-
-#ifndef WEB_CONTENTS_ADAPTER_P_H
-#define WEB_CONTENTS_ADAPTER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "web_contents_adapter.h"
-
-#include "base/callback.h"
-#include "base/memory/ref_counted.h"
-#include "ui/gfx/geometry/point_f.h"
-#include "third_party/WebKit/public/platform/WebDragOperation.h"
-
-#include <QScopedPointer>
-#include <QSharedPointer>
-
-QT_FORWARD_DECLARE_CLASS(QTemporaryDir)
-QT_FORWARD_DECLARE_CLASS(QWebChannel)
-
-class WebEngineContext;
-
-namespace content {
-struct DropData;
-}
-
-namespace QtWebEngineCore {
-
-class BrowserContextAdapter;
-class DevToolsFrontendQt;
-class RenderViewObserverHostQt;
-class WebChannelIPCTransportHost;
-class WebContentsAdapterClient;
-class WebContentsDelegateQt;
-class WebEngineContext;
-
-class WebContentsAdapterPrivate {
-public:
-    WebContentsAdapterPrivate();
-    ~WebContentsAdapterPrivate();
-    scoped_refptr<WebEngineContext> engineContext;
-    QSharedPointer<BrowserContextAdapter> browserContextAdapter;
-    std::unique_ptr<content::WebContents> webContents;
-    std::unique_ptr<WebContentsDelegateQt> webContentsDelegate;
-    std::unique_ptr<RenderViewObserverHostQt> renderViewObserverHost;
-    std::unique_ptr<WebChannelIPCTransportHost> webChannelTransport;
-    QWebChannel *webChannel;
-    unsigned int webChannelWorld;
-    WebContentsAdapterClient *adapterClient;
-    quint64 nextRequestId;
-    int lastFindRequestId;
-    std::unique_ptr<content::DropData> currentDropData;
-    blink::WebDragOperation currentDropAction;
-    bool updateDragActionCalled;
-    gfx::PointF lastDragClientPos;
-    gfx::PointF lastDragScreenPos;
-    std::unique_ptr<QTemporaryDir> dndTmpDir;
-    DevToolsFrontendQt *devToolsFrontend;
-};
-
-} // namespace QtWebEngineCore
-
-#endif // WEB_CONTENTS_ADAPTER_P_H
-- 
cgit v1.2.3