Merge WebKit at r63859 : Initial merge by git.

Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62

1 files changed, 5 insertions, 16 deletions

diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
index 9ac506c..b071385 100644
--- a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
+++ b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
@@ -37,7 +37,6 @@
 #include "GLES2Context.h"
 #include "LayerChromium.h"
 #include "NotImplemented.h"
-#include "Page.h"
 #include "TransformLayerChromium.h"
 #include "WebGLLayerChromium.h"
 #if PLATFORM(SKIA)
@@ -190,24 +189,24 @@ ShaderProgram::ShaderProgram()
 {
 }
 
-PassOwnPtr<LayerRendererChromium> LayerRendererChromium::create(Page* page)
+PassOwnPtr<LayerRendererChromium> LayerRendererChromium::create(PassOwnPtr<GLES2Context> gles2Context)
 {
-    return new LayerRendererChromium(page);
+    return new LayerRendererChromium(gles2Context);
 }
 
-LayerRendererChromium::LayerRendererChromium(Page* page)
+LayerRendererChromium::LayerRendererChromium(PassOwnPtr<GLES2Context> gles2Context)
     : m_rootLayer(0)
     , m_needsDisplay(false)
     , m_positionLocation(0)
     , m_texCoordLocation(1)
-    , m_page(page)
     , m_rootLayerTextureWidth(0)
     , m_rootLayerTextureHeight(0)
     , m_scrollPosition(IntPoint(-1, -1))
     , m_currentShaderProgramType(NumShaderProgramTypes)
+    , m_gles2Context(gles2Context)
 {
     m_quadVboIds[Vertices] = m_quadVboIds[LayerElements] = 0;
-    m_hardwareCompositing = (initGL() && initializeSharedGLObjects());
+    m_hardwareCompositing = (m_gles2Context && initializeSharedGLObjects());
 }
 
 LayerRendererChromium::~LayerRendererChromium()
@@ -645,16 +644,6 @@ bool LayerRendererChromium::makeContextCurrent()
     return m_gles2Context->makeCurrent();
 }
 
-bool LayerRendererChromium::initGL()
-{
-    m_gles2Context = GLES2Context::createOnscreen(m_page);
-
-    if (!m_gles2Context)
-        return false;
-
-    return true;
-}
-
 void LayerRendererChromium::bindCommonAttribLocations(ShaderProgramType program)
 {
     unsigned programId = m_shaderPrograms[program].m_shaderProgramId;