From 0875045c9714fbac897a8b9f277bb1b1ccfef962 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Thu, 4 Jul 2013 16:25:59 +0200 Subject: Fix linking of QtWebEngineProcess Since the global factory function content::CreateWebContentsView is also needed by the web process and we exclude all implementations we have to place the definition of it in the shared static lib. However, to prevent the need for moving platform layer classes back to the shared static lib we have to revert back to use ContentBrowserClient::OverrideCreateWebContentsView in the API layer to create our platform WebContentsViewQt and make the global factory function definition empty. Change-Id: I9d46524b22458b26a043c80df02b4a5fa7d91a55 Reviewed-by: Pierre Rossi --- shared/shared_globals.cpp | 6 ++++++ shared/shared_globals.h | 7 +++++++ 2 files changed, 13 insertions(+) (limited to 'shared') diff --git a/shared/shared_globals.cpp b/shared/shared_globals.cpp index 69687e6e2..bb2fcfb39 100644 --- a/shared/shared_globals.cpp +++ b/shared/shared_globals.cpp @@ -64,6 +64,12 @@ void GetScreenInfoFromNativeWindow(QWindow* window, WebKit::WebScreenInfo* resul } namespace content { +WebContentsViewPort* CreateWebContentsView(WebContentsImpl*, + WebContentsViewDelegate*, + RenderViewHostDelegateView**) +{ + return 0; +} RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost*) { // WebContentsViewQt should take care of this directly. diff --git a/shared/shared_globals.h b/shared/shared_globals.h index 0972c3a9e..1e4b9183a 100644 --- a/shared/shared_globals.h +++ b/shared/shared_globals.h @@ -44,6 +44,13 @@ #include "third_party/WebKit/public/platform/WebScreenInfo.h" +namespace content { +class WebContentsImpl; +class WebContentsViewPort; +class WebContentsViewDelegate; +class RenderViewHostDelegateView; +} // namespace content + class QWindow; void GetScreenInfoFromNativeWindow(QWindow* window, WebKit::WebScreenInfo* results); -- cgit v1.2.3