diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 16:19:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-14 08:15:39 +0000 |
| commit | f1e2b2d80366b43ba638290bca55272b000b3ce1 (patch) | |
| tree | 9b3d4708f0cd80a1c73aeacdbf3b5640c7fa80ab /src/core/web_engine_context.cpp | |
| parent | baaab31631dcff6075418c95f0220e8fb207dd50 (diff) | |
Adaptations to Chromium 53
Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 0687b23c5..368ad48e2 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -322,7 +322,7 @@ WebEngineContext::WebEngineContext() if (qt_gl_global_share_context()) { if (!strcmp(qt_gl_global_share_context()->nativeHandle().typeName(), "QEGLNativeContext")) { if (qt_gl_global_share_context()->isOpenGLES()) { - glType = gfx::kGLImplementationEGLName; + glType = gl::kGLImplementationEGLName; } else { QOpenGLContext context; QSurfaceFormat format; @@ -340,7 +340,7 @@ WebEngineContext::WebEngineContext() if (context.makeCurrent(&surface)) { if (context.hasExtension("GL_ARB_ES2_compatibility")) - glType = gfx::kGLImplementationEGLName; + glType = gl::kGLImplementationEGLName; context.doneCurrent(); } @@ -350,17 +350,17 @@ WebEngineContext::WebEngineContext() } } else { if (!qt_gl_global_share_context()->isOpenGLES()) - glType = gfx::kGLImplementationDesktopName; + glType = gl::kGLImplementationDesktopName; } } else { qWarning("WebEngineContext used before QtWebEngine::initialize()"); // We have to assume the default OpenGL module type will be used. switch (QOpenGLContext::openGLModuleType()) { case QOpenGLContext::LibGL: - glType = gfx::kGLImplementationDesktopName; + glType = gl::kGLImplementationDesktopName; break; case QOpenGLContext::LibGLES: - glType = gfx::kGLImplementationEGLName; + glType = gl::kGLImplementationEGLName; break; } } @@ -395,6 +395,8 @@ WebEngineContext::WebEngineContext() // first gets referenced on the IO thread. MediaCaptureDevicesDispatcher::GetInstance(); + base::ThreadRestrictions::SetIOAllowed(true); + #if defined(ENABLE_PLUGINS) // Creating pepper plugins from the page (which calls PluginService::GetPluginInfoArray) // might fail unless the page queried the list of available plugins at least once |