• noam.rosenthal@nokia.com's avatar
    [Qt][Texmap] Refactor TextureMapper API to use ImageBuffers when possible. · ea92bee0
    noam.rosenthal@nokia.com authored
    https://bugs.webkit.org/show_bug.cgi?id=77148
    
    Reviewed by Martin Robinson.
    
    Source/WebCore:
    
    Removed TextureMapperQt, and instead created a TextureMapperImageBuffer class,
    which responds to an "Software" mode of TextureMapper, instead of creating subclasses
    of TextureMapper directly. This allows using the software fallback of TextureMapper by any
    sort.
    
    To make the ImageBuffer backend easier, content updates to BitmapTexture can now use either
    an image, or a raw data pointer. The raw data pointer is provided for performance reasons,
    as converting data to/from Image references in Qt generates unnecessary deep copies of the
    image data.
    
    Also, functions that use TransformationMatrix were added to GraphicsContext, to allow for
    3D transforms in cross platform code.
    After this patch everything renders the same. An additional bug report was created to allow
    ImageBuffer shallow image copies: https://bugs.webkit.org/show_bug.cgi?id=77689
    
    Covered extensively by existing tests, no behavioral changes.
    
    * Target.pri:
    * platform/graphics/GraphicsContext.cpp:
    * platform/graphics/GraphicsContext.h:
    (WebCore):
    (GraphicsContext):
    * platform/graphics/cairo/TextureMapperCairo.cpp:
    * platform/graphics/opengl/TextureMapperGL.cpp:
    (TextureMapperGLData):
    (BitmapTextureGL):
    (WebCore::BitmapTextureGL::BitmapTextureGL):
    (WebCore::TextureMapperGL::beginPainting):
    (WebCore::BitmapTextureGL::reset):
    (WebCore):
    (WebCore::swizzleBGRAToRGBA):
    (WebCore::BitmapTextureGL::updateContents):
    (WebCore::BitmapTextureGL::destroy):
    (WebCore::TextureMapperGL::bindSurface):
    (WebCore::TextureMapper::platformCreateAccelerated):
    * platform/graphics/opengl/TextureMapperGL.h:
    (TextureMapperGL):
    (WebCore::TextureMapperGL::accelerationMode):
    (WebCore):
    * platform/graphics/qt/GraphicsContext3DQt.cpp:
    (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
    * platform/graphics/qt/GraphicsContextQt.cpp:
    (WebCore):
    (WebCore::GraphicsContext::get3DTransform):
    (WebCore::GraphicsContext::concat3DTransform):
    (WebCore::GraphicsContext::set3DTransform):
    * platform/graphics/qt/TextureMapperQt.cpp: Removed.
    * platform/graphics/qt/TextureMapperQt.h: Removed.
    * platform/graphics/texmap/TextureMapper.cpp:
    (WebCore):
    (BitmapTextureImageBuffer):
    (TextureMapperImageBuffer):
    * platform/graphics/texmap/TextureMapper.h:
    (WebCore::BitmapTexture::BitmapTexture):
    (BitmapTexture):
    (WebCore::BitmapTexture::bpp):
    (WebCore::BitmapTexture::isOpaque):
    (WebCore::TextureMapper::setGraphicsContext):
    (WebCore::TextureMapper::graphicsContext):
    (TextureMapper):
    (WebCore::TextureMapper::TextureMapper):
    (WebCore::TextureMapper::platformCreateAccelerated):
    * platform/graphics/texmap/TextureMapperNode.cpp:
    (WebCore::TextureMapperNode::renderContent):
    (WebCore::TextureMapperNode::setContentsTileBackBuffer):
    * platform/graphics/texmap/TextureMapperNode.h:
    (TextureMapperNode):
    
    Source/WebKit/qt:
    
    Use TextureMapper::create instead of creating TextureMapperGL/TextureMapperQt directly.
    
    * Api/qwebframe.cpp:
    (QWebFramePrivate::renderCompositedLayers):
    * WebCoreSupport/PageClientQt.cpp:
    (WebCore::PageClientQWidget::setRootGraphicsLayer):
    (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
    
    Source/WebKit2:
    
    Use TextureMapper::create instead of creating TextureMapperGL/TextureMapperQt directly.
    Remove calls to unused API.
    
    * UIProcess/qt/LayerTreeHostProxyQt.cpp:
    (WebKit::LayerTreeHostProxy::paintToCurrentGLContext):
    (WebKit::LayerTreeHostProxy::paintToGraphicsContext):
    (WebKit::LayerTreeHostProxy::createImage):
    (WebKit::LayerTreeHostProxy::ensureRootLayer):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106620 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    ea92bee0
ChangeLog 2.58 MB