Google Git
Sign in
chromium / chromium / src / 66f69e4e04..e33a44a707 / .
diff --git a/chrome/VERSION b/chrome/VERSION
index 8456c5b..32f2a84 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION

@@ -1,4 +1,4 @@
 MAJOR=54
 MINOR=0
-BUILD=2792
+BUILD=2793
 PATCH=0

diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM
index 1298966..4051b9b 100644
--- a/chromeos/CHROMEOS_LKGM
+++ b/chromeos/CHROMEOS_LKGM

@@ -1 +1 @@
-8530.0.0
\ No newline at end of file
+8562.0.0
\ No newline at end of file

diff --git a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp
index 5385c455..85bf211d 100644
--- a/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp
+++ b/third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

@@ -484,13 +484,7 @@
             m_antiAliasingMode = ScreenSpaceAntialiasing;
         }
     }
-    // TODO(dshwang): enable storage texture on all platform. crbug.com/557848
-    // Linux ATI bot fails WebglConformance.conformance_textures_misc_tex_image_webgl
-    // So use storage texture only if ScreenSpaceAntialiasing is enabled,
-    // because ScreenSpaceAntialiasing is much faster with storage texture.
-    m_storageTextureSupported = (m_webGLVersion > WebGL1
-        ||  m_extensionsUtil->supportsExtension("GL_EXT_texture_storage"))
-        && m_antiAliasingMode == ScreenSpaceAntialiasing;
+    m_storageTextureSupported = m_webGLVersion > WebGL1 || m_extensionsUtil->supportsExtension("GL_EXT_texture_storage");
     m_sampleCount = std::min(4, maxSampleCount);
 
     m_gl->GenFramebuffers(1, &m_fbo);

diff --git a/third_party/WebKit/public/platform/WebExternalTextureMailbox.h b/third_party/WebKit/public/platform/WebExternalTextureMailbox.h
index 3d27f00..0bb41cfd 100644
--- a/third_party/WebKit/public/platform/WebExternalTextureMailbox.h
+++ b/third_party/WebKit/public/platform/WebExternalTextureMailbox.h

@@ -41,7 +41,6 @@
     bool validSyncToken = false;
     bool allowOverlay = false;
     bool nearestNeighbor = false;
-    int gpuMemoryBufferId = -1;
     unsigned textureTarget = 0;
     WebSize textureSize;