summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-07-04 16:25:59 +0200
committerPierre Rossi <pierre.rossi@gmail.com>2013-07-04 18:37:59 +0200
commit0875045c9714fbac897a8b9f277bb1b1ccfef962 (patch)
tree7a5f5c125f7250b43a2b83d5664317caf7a3a1d5 /shared
parent8d46c7e1d447c4d2fbc9e57ff53456ddf72ee4e3 (diff)
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 <pierre.rossi@gmail.com>
Diffstat (limited to 'shared')
-rw-r--r--shared/shared_globals.cpp6
-rw-r--r--shared/shared_globals.h7
2 files changed, 13 insertions, 0 deletions
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);