<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183807] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183807">183807</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-05 08:48:29 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove TextureMapperImageBuffer
https://bugs.webkit.org/show_bug.cgi?id=143561
Reviewed by Žan Doberšek.
Source/WebCore:
* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformWinCairo.cmake:
* platform/graphics/GraphicsContext3DPrivate.cpp:
(WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBufferData::paintToTextureMapper):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::paintToTextureMapper):
* platform/graphics/texmap/BitmapTextureImageBuffer.cpp: Removed.
* platform/graphics/texmap/BitmapTextureImageBuffer.h: Removed.
* platform/graphics/texmap/BitmapTexturePool.cpp:
(WebCore::BitmapTexturePool::createTexture):
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::setFilters):
* platform/graphics/texmap/TextureMapper.cpp:
(WebCore::TextureMapper::create):
(WebCore::TextureMapper::TextureMapper):
* platform/graphics/texmap/TextureMapper.h:
(WebCore::TextureMapper::accelerationMode): Deleted.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::TextureMapperGL):
* platform/graphics/texmap/TextureMapperImageBuffer.cpp: Removed.
* platform/graphics/texmap/TextureMapperImageBuffer.h: Removed.
* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
(WebCore::CompositingCoordinator::CompositingCoordinator):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::GraphicsLayer::supportsContentsTiling):
(WebCore::CoordinatedGraphicsLayer::setShouldSupportContentsTiling): Deleted.
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
Source/WebKit2:
* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
(WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
(WebKit::LayerTreeHostGtk::setNativeSurfaceHandleForCompositing):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWinCairocmake">trunk/Source/WebCore/PlatformWinCairo.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContext3DPrivatecpp">trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp">trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapBitmapTexturePoolcpp">trunk/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp">trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapBitmapTextureImageBuffercpp">trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureImageBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapBitmapTextureImageBufferh">trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureImageBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBuffercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBufferh">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -2194,7 +2194,6 @@
</span><span class="cx"> platform/graphics/texmap/TextureMapperAnimation.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperBackingStore.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperFPSCounter.cpp
</span><del>- platform/graphics/texmap/TextureMapperImageBuffer.cpp
</del><span class="cx"> platform/graphics/texmap/TextureMapperLayer.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperTile.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/ChangeLog 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-05-05 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove TextureMapperImageBuffer
+ https://bugs.webkit.org/show_bug.cgi?id=143561
+
+ Reviewed by Žan Doberšek.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * PlatformWinCairo.cmake:
+ * platform/graphics/GraphicsContext3DPrivate.cpp:
+ (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBufferData::paintToTextureMapper):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::paintToTextureMapper):
+ * platform/graphics/texmap/BitmapTextureImageBuffer.cpp: Removed.
+ * platform/graphics/texmap/BitmapTextureImageBuffer.h: Removed.
+ * platform/graphics/texmap/BitmapTexturePool.cpp:
+ (WebCore::BitmapTexturePool::createTexture):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::GraphicsLayerTextureMapper::setFilters):
+ * platform/graphics/texmap/TextureMapper.cpp:
+ (WebCore::TextureMapper::create):
+ (WebCore::TextureMapper::TextureMapper):
+ * platform/graphics/texmap/TextureMapper.h:
+ (WebCore::TextureMapper::accelerationMode): Deleted.
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::TextureMapperGL):
+ * platform/graphics/texmap/TextureMapperImageBuffer.cpp: Removed.
+ * platform/graphics/texmap/TextureMapperImageBuffer.h: Removed.
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+ (WebCore::CompositingCoordinator::CompositingCoordinator):
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::supportsContentsTiling):
+ (WebCore::CoordinatedGraphicsLayer::setShouldSupportContentsTiling): Deleted.
+ * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
+
</ins><span class="cx"> 2015-05-05 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Box Alignment] Upgrade align-content parsing to CSS3 Box Alignment spec
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -182,7 +182,6 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/texmap/BitmapTexture.cpp
</span><span class="cx"> platform/graphics/texmap/BitmapTextureGL.cpp
</span><del>- platform/graphics/texmap/BitmapTextureImageBuffer.cpp
</del><span class="cx"> platform/graphics/texmap/BitmapTexturePool.cpp
</span><span class="cx"> platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperGL.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -383,11 +383,9 @@
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> platform/graphics/texmap/BitmapTexture.cpp
</span><span class="cx"> platform/graphics/texmap/BitmapTextureGL.cpp
</span><del>- platform/graphics/texmap/BitmapTextureImageBuffer.cpp
</del><span class="cx"> platform/graphics/texmap/BitmapTexturePool.cpp
</span><span class="cx"> platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperGL.cpp
</span><del>- platform/graphics/texmap/TextureMapperImageBuffer.cpp
</del><span class="cx"> platform/graphics/texmap/TextureMapperShaderProgram.cpp
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWinCairo.cmake (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWinCairo.cmake 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/PlatformWinCairo.cmake 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/texmap/BitmapTexture.cpp
</span><span class="cx"> platform/graphics/texmap/BitmapTextureGL.cpp
</span><del>- platform/graphics/texmap/BitmapTextureImageBuffer.cpp
</del><span class="cx"> platform/graphics/texmap/BitmapTexturePool.cpp
</span><span class="cx"> platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapper.cpp
</span><span class="lines">@@ -67,7 +66,6 @@
</span><span class="cx"> platform/graphics/texmap/TextureMapperBackingStore.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperFPSCounter.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperGL.cpp
</span><del>- platform/graphics/texmap/TextureMapperImageBuffer.cpp
</del><span class="cx"> platform/graphics/texmap/TextureMapperLayer.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperShaderProgram.cpp
</span><span class="cx"> platform/graphics/texmap/TextureMapperSurfaceBackingStore.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3DPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -89,45 +89,6 @@
</span><span class="cx">
</span><span class="cx"> m_context->markLayerComposited();
</span><span class="cx">
</span><del>- // FIXME: We do not support mask for the moment with TextureMapperImageBuffer.
- if (textureMapper->accelerationMode() != TextureMapper::OpenGLMode) {
- GraphicsContext* context = textureMapper->graphicsContext();
- context->save();
- context->platformContext()->setGlobalAlpha(opacity);
-
- const int height = m_context->m_currentHeight;
- const int width = m_context->m_currentWidth;
- int totalBytes = width * height * 4;
-
- auto pixels = std::make_unique<unsigned char[]>(totalBytes);
- if (!pixels)
- return;
-
- // OpenGL keeps the pixels stored bottom up, so we need to flip the image here.
- context->translate(0, height);
- context->scale(FloatSize(1, -1));
-
- context->concatCTM(matrix.toAffineTransform());
-
- m_context->readRenderingResults(pixels.get(), totalBytes);
-
- // Premultiply alpha.
- for (int i = 0; i < totalBytes; i += 4)
- if (pixels[i + 3] != 255) {
- pixels[i + 0] = min(255, pixels[i + 0] * pixels[i + 3] / 255);
- pixels[i + 1] = min(255, pixels[i + 1] * pixels[i + 3] / 255);
- pixels[i + 2] = min(255, pixels[i + 2] * pixels[i + 3] / 255);
- }
-
- RefPtr<cairo_surface_t> imageSurface = adoptRef(cairo_image_surface_create_for_data(
- const_cast<unsigned char*>(pixels.get()), CAIRO_FORMAT_ARGB32, width, height, width * 4));
-
- context->platformContext()->drawSurfaceToContext(imageSurface.get(), targetRect, IntRect(0, 0, width, height), context);
-
- context->restore();
- return;
- }
-
</del><span class="cx"> #if USE(TEXTURE_MAPPER_GL)
</span><span class="cx"> if (m_context->m_attrs.antialias && m_context->m_state.boundFBO == m_context->m_multisampleFBO) {
</span><span class="cx"> GLContext* previousActiveContext = GLContext::getCurrent();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoImageBufferCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -396,11 +396,6 @@
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> void ImageBufferData::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
</span><span class="cx"> {
</span><del>- if (textureMapper->accelerationMode() != TextureMapper::OpenGLMode) {
- notImplemented();
- return;
- }
-
</del><span class="cx"> ASSERT(m_texture);
</span><span class="cx">
</span><span class="cx"> // Cairo may change the active context, so we make sure to change it back after flushing.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -530,9 +530,6 @@
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
</span><span class="cx"> void MediaPlayerPrivateGStreamerBase::paintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity)
</span><span class="cx"> {
</span><del>- if (textureMapper->accelerationMode() != TextureMapper::OpenGLMode)
- return;
-
</del><span class="cx"> if (!m_player->visible())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapBitmapTextureImageBuffercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureImageBuffer.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureImageBuffer.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureImageBuffer.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2014 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "BitmapTextureImageBuffer.h"
-
-#include "GraphicsLayer.h"
-
-namespace WebCore {
-
-void BitmapTextureImageBuffer::updateContents(const void* data, const IntRect& targetRect, const IntPoint& sourceOffset, int bytesPerLine, UpdateContentsFlag)
-{
-#if PLATFORM(CAIRO)
- RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create_for_data(static_cast<unsigned char*>(data()),
- CAIRO_FORMAT_ARGB32, targetRect.width(), targetRect.height(), bytesPerLine));
- m_image->context()->platformContext()->drawSurfaceToContext(surface.get(), targetRect,
- IntRect(sourceOffset, targetRect.size()), m_image->context());
-#else
- UNUSED_PARAM(data);
- UNUSED_PARAM(targetRect);
- UNUSED_PARAM(sourceOffset);
- UNUSED_PARAM(bytesPerLine);
-#endif
-}
-
-void BitmapTextureImageBuffer::updateContents(TextureMapper*, GraphicsLayer* sourceLayer, const IntRect& targetRect, const IntPoint& sourceOffset, UpdateContentsFlag)
-{
- GraphicsContext* context = m_image->context();
-
- context->clearRect(targetRect);
-
- IntRect sourceRect(targetRect);
- sourceRect.setLocation(sourceOffset);
- context->save();
- context->clip(targetRect);
- context->translate(targetRect.x() - sourceOffset.x(), targetRect.y() - sourceOffset.y());
- sourceLayer->paintGraphicsLayerContents(*context, sourceRect);
- context->restore();
-}
-
-void BitmapTextureImageBuffer::didReset()
-{
- m_image = ImageBuffer::create(contentSize());
-}
-
-void BitmapTextureImageBuffer::updateContents(Image* image, const IntRect& targetRect, const IntPoint& offset, UpdateContentsFlag)
-{
- m_image->context()->drawImage(image, ColorSpaceDeviceRGB, targetRect, IntRect(offset, targetRect.size()), CompositeCopy);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapBitmapTextureImageBufferh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureImageBuffer.h (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureImageBuffer.h 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureImageBuffer.h 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
- * Copyright (C) 2014 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef BitmapTextureImageBuffer_h
-#define BitmapTextureImageBuffer_h
-
-#include "BitmapTexture.h"
-#include "ImageBuffer.h"
-#include "IntRect.h"
-#include "IntSize.h"
-
-namespace WebCore {
-
-class GraphicsContext;
-
-class BitmapTextureImageBuffer : public BitmapTexture {
-public:
- static PassRefPtr<BitmapTexture> create() { return adoptRef(new BitmapTextureImageBuffer); }
- virtual IntSize size() const { return m_image->internalSize(); }
- virtual void didReset();
- virtual bool isValid() const { return m_image.get(); }
- inline GraphicsContext* graphicsContext() { return m_image ? m_image->context() : 0; }
- virtual void updateContents(Image*, const IntRect&, const IntPoint&, UpdateContentsFlag);
- virtual void updateContents(TextureMapper*, GraphicsLayer*, const IntRect& target, const IntPoint& offset, UpdateContentsFlag);
- virtual void updateContents(const void*, const IntRect& target, const IntPoint& sourceOffset, int bytesPerLine, UpdateContentsFlag);
- PassRefPtr<BitmapTexture> applyFilters(TextureMapper*, const FilterOperations&);
- ImageBuffer* image() const { return m_image.get(); }
-
-private:
- BitmapTextureImageBuffer() { }
- std::unique_ptr<ImageBuffer> m_image;
-};
-
-}
-
-#endif // BitmapTextureImageBuffer_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapBitmapTexturePoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/BitmapTexturePool.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -106,8 +106,6 @@
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL)
</span><span class="cx"> BitmapTextureGL* texture = new BitmapTextureGL(m_context3D);
</span><span class="cx"> return adoptRef(texture);
</span><del>-#else
- return BitmapTextureImageBuffer::create();
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapGraphicsLayerTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -602,8 +602,7 @@
</span><span class="cx"> bool GraphicsLayerTextureMapper::setFilters(const FilterOperations& filters)
</span><span class="cx"> {
</span><span class="cx"> TextureMapper* textureMapper = m_layer.textureMapper();
</span><del>- // TextureMapperImageBuffer does not support CSS filters.
- if (!textureMapper || textureMapper->accelerationMode() == TextureMapper::SoftwareMode)
</del><ins>+ if (!textureMapper)
</ins><span class="cx"> return false;
</span><span class="cx"> notifyChange(FilterChange);
</span><span class="cx"> return GraphicsLayer::setFilters(filters);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include "BitmapTexturePool.h"
</span><span class="cx"> #include "FilterOperations.h"
</span><span class="cx"> #include "GraphicsLayer.h"
</span><del>-#include "TextureMapperImageBuffer.h"
</del><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="lines">@@ -38,18 +37,15 @@
</span><span class="cx"> return selectedTexture.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<TextureMapper> TextureMapper::create(AccelerationMode mode)
</del><ins>+std::unique_ptr<TextureMapper> TextureMapper::create()
</ins><span class="cx"> {
</span><del>- if (mode == SoftwareMode)
- return std::make_unique<TextureMapperImageBuffer>();
</del><span class="cx"> return platformCreateAccelerated();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextureMapper::TextureMapper(AccelerationMode accelerationMode)
</del><ins>+TextureMapper::TextureMapper()
</ins><span class="cx"> : m_context(0)
</span><span class="cx"> , m_interpolationQuality(InterpolationDefault)
</span><span class="cx"> , m_textDrawingMode(TextModeFill)
</span><del>- , m_accelerationMode(accelerationMode)
</del><span class="cx"> , m_isMaskMode(false)
</span><span class="cx"> , m_wrapMode(StretchWrap)
</span><span class="cx"> { }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> class TextureMapper {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- enum AccelerationMode { SoftwareMode, OpenGLMode };
</del><span class="cx"> enum PaintFlag {
</span><span class="cx"> PaintingMirrored = 1 << 0,
</span><span class="cx"> };
</span><span class="lines">@@ -59,9 +58,9 @@
</span><span class="cx">
</span><span class="cx"> typedef unsigned PaintFlags;
</span><span class="cx">
</span><del>- static std::unique_ptr<TextureMapper> create(AccelerationMode newMode = SoftwareMode);
</del><ins>+ static std::unique_ptr<TextureMapper> create();
</ins><span class="cx">
</span><del>- explicit TextureMapper(AccelerationMode);
</del><ins>+ explicit TextureMapper();
</ins><span class="cx"> virtual ~TextureMapper();
</span><span class="cx">
</span><span class="cx"> enum ExposedEdges {
</span><span class="lines">@@ -93,7 +92,6 @@
</span><span class="cx">
</span><span class="cx"> InterpolationQuality imageInterpolationQuality() const { return m_interpolationQuality; }
</span><span class="cx"> TextDrawingModeFlags textDrawingMode() const { return m_textDrawingMode; }
</span><del>- AccelerationMode accelerationMode() const { return m_accelerationMode; }
</del><span class="cx">
</span><span class="cx"> virtual void beginPainting(PaintFlags = 0) { }
</span><span class="cx"> virtual void endPainting() { }
</span><span class="lines">@@ -126,7 +124,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> InterpolationQuality m_interpolationQuality;
</span><span class="cx"> TextDrawingModeFlags m_textDrawingMode;
</span><del>- AccelerationMode m_accelerationMode;
</del><span class="cx"> bool m_isMaskMode;
</span><span class="cx"> TransformationMatrix m_patternTransform;
</span><span class="cx"> WrapMode m_wrapMode;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -241,8 +241,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TextureMapperGL::TextureMapperGL()
</span><del>- : TextureMapper(OpenGLMode)
- , m_enableEdgeDistanceAntialiasing(false)
</del><ins>+ : m_enableEdgeDistanceAntialiasing(false)
</ins><span class="cx"> {
</span><span class="cx"> m_context3D = GraphicsContext3D::createForCurrentGLContext();
</span><span class="cx"> m_data = new TextureMapperGLData(m_context3D.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBuffercpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -1,125 +0,0 @@
</span><del>-/*
- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "TextureMapperImageBuffer.h"
-
-#include "BitmapTexturePool.h"
-#include "GraphicsLayer.h"
-#include "NotImplemented.h"
-
-#if USE(TEXTURE_MAPPER)
-namespace WebCore {
-
-static const int s_maximumAllowedImageBufferDimension = 4096;
-
-TextureMapperImageBuffer::TextureMapperImageBuffer()
- : TextureMapper(SoftwareMode)
-{
- m_texturePool = std::make_unique<BitmapTexturePool>();
-}
-
-IntSize TextureMapperImageBuffer::maxTextureSize() const
-{
- return IntSize(s_maximumAllowedImageBufferDimension, s_maximumAllowedImageBufferDimension);
-}
-
-void TextureMapperImageBuffer::beginClip(const TransformationMatrix& matrix, const FloatRect& rect)
-{
- GraphicsContext* context = currentContext();
- if (!context)
- return;
-#if ENABLE(3D_TRANSFORMS)
- TransformationMatrix previousTransform = context->get3DTransform();
-#else
- AffineTransform previousTransform = context->getCTM();
-#endif
- context->save();
-
-#if ENABLE(3D_TRANSFORMS)
- context->concat3DTransform(matrix);
-#else
- context->concatCTM(matrix.toAffineTransform());
-#endif
-
- context->clip(rect);
-
-#if ENABLE(3D_TRANSFORMS)
- context->set3DTransform(previousTransform);
-#else
- context->setCTM(previousTransform);
-#endif
-}
-
-void TextureMapperImageBuffer::drawTexture(const BitmapTexture& texture, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, unsigned /* exposedEdges */)
-{
- GraphicsContext* context = currentContext();
- if (!context)
- return;
-
- const BitmapTextureImageBuffer& textureImageBuffer = static_cast<const BitmapTextureImageBuffer&>(texture);
- ImageBuffer* image = textureImageBuffer.image();
- context->save();
- context->setCompositeOperation(isInMaskMode() ? CompositeDestinationIn : CompositeSourceOver);
- context->setAlpha(opacity);
-#if ENABLE(3D_TRANSFORMS)
- context->concat3DTransform(matrix);
-#else
- context->concatCTM(matrix.toAffineTransform());
-#endif
- context->drawImageBuffer(image, ColorSpaceDeviceRGB, targetRect);
- context->restore();
-}
-
-void TextureMapperImageBuffer::drawSolidColor(const FloatRect& rect, const TransformationMatrix& matrix, const Color& color)
-{
- GraphicsContext* context = currentContext();
- if (!context)
- return;
-
- context->save();
- context->setCompositeOperation(isInMaskMode() ? CompositeDestinationIn : CompositeSourceOver);
-#if ENABLE(3D_TRANSFORMS)
- context->concat3DTransform(matrix);
-#else
- context->concatCTM(matrix.toAffineTransform());
-#endif
-
- context->fillRect(rect, color, ColorSpaceDeviceRGB);
- context->restore();
-}
-
-void TextureMapperImageBuffer::drawBorder(const Color&, float /* borderWidth */, const FloatRect&, const TransformationMatrix&)
-{
- notImplemented();
-}
-
-void TextureMapperImageBuffer::drawNumber(int /* number */, const Color&, const FloatPoint&, const TransformationMatrix&)
-{
- notImplemented();
-}
-
-PassRefPtr<BitmapTexture> BitmapTextureImageBuffer::applyFilters(TextureMapper*, const FilterOperations&)
-{
- ASSERT_NOT_REACHED();
- return this;
-}
-
-}
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperImageBufferh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- */
-
-#ifndef TextureMapperImageBuffer_h
-#define TextureMapperImageBuffer_h
-
-#include "BitmapTextureImageBuffer.h"
-#include "ImageBuffer.h"
-#include "TextureMapper.h"
-
-#if USE(TEXTURE_MAPPER)
-namespace WebCore {
-
-class TextureMapperImageBuffer : public TextureMapper {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- TextureMapperImageBuffer();
-
- // TextureMapper implementation
- virtual void drawBorder(const Color&, float borderWidth, const FloatRect&, const TransformationMatrix&) override;
- virtual void drawNumber(int number, const Color&, const FloatPoint&, const TransformationMatrix&) override;
- virtual void drawTexture(const BitmapTexture&, const FloatRect& targetRect, const TransformationMatrix&, float opacity, unsigned exposedEdges) override;
- virtual void drawSolidColor(const FloatRect&, const TransformationMatrix&, const Color&) override;
- virtual void beginClip(const TransformationMatrix&, const FloatRect&) override;
- virtual void bindSurface(BitmapTexture* surface) override { m_currentSurface = surface;}
- virtual void endClip() override { graphicsContext()->restore(); }
- virtual IntRect clipBounds() override { return currentContext()->clipBounds(); }
- virtual IntSize maxTextureSize() const;
- virtual PassRefPtr<BitmapTexture> createTexture() override { return BitmapTextureImageBuffer::create(); }
-
- inline GraphicsContext* currentContext()
- {
- return m_currentSurface ? static_cast<BitmapTextureImageBuffer*>(m_currentSurface.get())->graphicsContext() : graphicsContext();
- }
-
-private:
- RefPtr<BitmapTexture> m_currentSurface;
-};
-
-}
-#endif // USE(TEXTURE_MAPPER)
-
-#endif // TextureMapperImageBuffer_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -65,10 +65,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> m_page->settings().setApplyDeviceScaleFactorInCompositor(true);
</span><del>-
- // This is a temporary way to enable this only in the GL case, until TextureMapperImageBuffer is removed.
- // See https://bugs.webkit.org/show_bug.cgi?id=114869
- CoordinatedGraphicsLayer::setShouldSupportContentsTiling(true);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CompositingCoordinator::setRootCompositingLayer(GraphicsLayer* compositingLayer, GraphicsLayer* overlayLayer)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -366,16 +366,9 @@
</span><span class="cx"> didChangeLayerState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool s_shouldSupportContentsTiling = false;
-
-void CoordinatedGraphicsLayer::setShouldSupportContentsTiling(bool s)
-{
- s_shouldSupportContentsTiling = s;
-}
-
</del><span class="cx"> bool GraphicsLayer::supportsContentsTiling()
</span><span class="cx"> {
</span><del>- return s_shouldSupportContentsTiling;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CoordinatedGraphicsLayer::setContentsNeedsDisplay()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -147,7 +147,6 @@
</span><span class="cx"> void setNeedsVisibleRectAdjustment();
</span><span class="cx"> void purgeBackingStores();
</span><span class="cx">
</span><del>- static void setShouldSupportContentsTiling(bool);
</del><span class="cx"> CoordinatedGraphicsLayer* findFirstDescendantWithContentsRecursively();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-05 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove TextureMapperImageBuffer
+ https://bugs.webkit.org/show_bug.cgi?id=143561
+
+ Reviewed by Žan Doberšek.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::paintToCurrentGLContext):
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ (WebKit::LayerTreeHostGtk::setNativeSurfaceHandleForCompositing):
+
</ins><span class="cx"> 2015-05-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Network Cache: IOChannel operations are not sent to the right thread
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCoordinatedGraphicsCoordinatedGraphicsScenecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> void CoordinatedGraphicsScene::paintToCurrentGLContext(const TransformationMatrix& matrix, float opacity, const FloatRect& clipRect, const Color& backgroundColor, bool drawsBackground, const FloatPoint& contentPosition, TextureMapper::PaintFlags PaintFlags)
</span><span class="cx"> {
</span><span class="cx"> if (!m_textureMapper) {
</span><del>- m_textureMapper = TextureMapper::create(TextureMapper::OpenGLMode);
</del><ins>+ m_textureMapper = TextureMapper::create();
</ins><span class="cx"> static_cast<TextureMapperGL*>(m_textureMapper.get())->setEnableEdgeDistanceAntialiasing(true);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (183806 => 183807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2015-05-05 15:20:36 UTC (rev 183806)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2015-05-05 15:48:29 UTC (rev 183807)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_isValid);
</span><span class="cx"> ASSERT(!m_textureMapper);
</span><del>- m_textureMapper = TextureMapper::create(TextureMapper::OpenGLMode);
</del><ins>+ m_textureMapper = TextureMapper::create();
</ins><span class="cx"> static_cast<TextureMapperGL*>(m_textureMapper.get())->setEnableEdgeDistanceAntialiasing(true);
</span><span class="cx"> downcast<GraphicsLayerTextureMapper>(*m_rootLayer).layer().setTextureMapper(m_textureMapper.get());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>