Modified: trunk/Source/WebCore/ChangeLog (219504 => 219505)
--- trunk/Source/WebCore/ChangeLog 2017-07-14 15:54:31 UTC (rev 219504)
+++ trunk/Source/WebCore/ChangeLog 2017-07-14 15:58:47 UTC (rev 219505)
@@ -1,5 +1,24 @@
2017-07-14 Fujii Hironori <[email protected]>
+ [WinCairo] error 'm_compositorTexture': undeclared identifier since Bug 174345
+ https://bugs.webkit.org/show_bug.cgi?id=174493
+
+ Reviewed by Alex Christensen.
+
+ Compilation errors are reported by the code using a member
+ m_compositorTexture of GraphicsContext3D which exists only if
+ USE(COORDINATED_GRAPHICS_THREADED). WinCairo port doesn't use it.
+
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+ Use m_compositorTexture only if USE(COORDINATED_GRAPHICS_THREADED).
+ (WebCore::GraphicsContext3D::~GraphicsContext3D): Ditto.
+ * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+ (WebCore::GraphicsContext3D::reshapeFBOs):
+ Ditto. Fix the wrong indentation level.
+
+2017-07-14 Fujii Hironori <[email protected]>
+
[HarfBuzz] Decomposed Vietnamese characters are rendered incorrectly
https://bugs.webkit.org/show_bug.cgi?id=174418
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (219504 => 219505)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2017-07-14 15:54:31 UTC (rev 219504)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2017-07-14 15:58:47 UTC (rev 219505)
@@ -90,7 +90,9 @@
, m_currentHeight(0)
, m_attrs(attributes)
, m_texture(0)
+#if USE(COORDINATED_GRAPHICS_THREADED)
, m_compositorTexture(0)
+#endif
, m_fbo(0)
#if USE(COORDINATED_GRAPHICS_THREADED)
, m_intermediateTexture(0)
@@ -233,8 +235,10 @@
makeContextCurrent();
if (m_texture)
::glDeleteTextures(1, &m_texture);
+#if USE(COORDINATED_GRAPHICS_THREADED)
if (m_compositorTexture)
::glDeleteTextures(1, &m_compositorTexture);
+#endif
if (m_attrs.antialias) {
::glDeleteRenderbuffers(1, &m_multisampleColorBuffer);
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (219504 => 219505)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2017-07-14 15:54:31 UTC (rev 219504)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2017-07-14 15:58:47 UTC (rev 219505)
@@ -110,6 +110,7 @@
::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, pixelDataType, 0);
::glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0);
+#if USE(COORDINATED_GRAPHICS_THREADED)
if (m_compositorTexture) {
::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
@@ -116,10 +117,9 @@
::glBindTexture(GL_TEXTURE_2D, 0);
}
-#if USE(COORDINATED_GRAPHICS_THREADED)
- ::glBindTexture(GL_TEXTURE_2D, m_intermediateTexture);
- ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
- ::glBindTexture(GL_TEXTURE_2D, 0);
+ ::glBindTexture(GL_TEXTURE_2D, m_intermediateTexture);
+ ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
+ ::glBindTexture(GL_TEXTURE_2D, 0);
#endif
Extensions3DOpenGLES& extensions = static_cast<Extensions3DOpenGLES&>(getExtensions());
