1 files changed, 4 insertions, 7 deletions
diff --git a/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc b/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc
index a5446a0059a..acc9e6946f0 100644
--- a/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/chromium/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2975,8 +2975,9 @@ bool BackRenderbuffer::AllocateStorage(const gfx::Size& size,
                              size.height());
   } else {
     // TODO(kainino): This path will not perform RegenerateRenderbufferIfNeeded
-    // on devices where multisample_renderbuffer_resize_emulation is needed.
-    // Thus any code using this path (pepper?) could encounter issues on those
+    // on devices where multisample_renderbuffer_resize_emulation or
+    // depth_stencil_renderbuffer_resize_emulation is needed.  Thus any code
+    // using this path (pepper?) could encounter issues on those
     // devices. RenderbufferStorageMultisampleWithWorkaround should be used
     // instead, but can only be used if BackRenderbuffer tracks its
     // renderbuffers in the renderbuffer manager instead of manually.
@@ -8552,11 +8553,7 @@ void GLES2DecoderImpl::RenderbufferStorageMultisampleHelper(
 
 bool GLES2DecoderImpl::RegenerateRenderbufferIfNeeded(
     Renderbuffer* renderbuffer) {
-  if (!workarounds().multisample_renderbuffer_resize_emulation) {
-    return false;
-  }
-
-  if (!renderbuffer->RegenerateAndBindBackingObjectIfNeeded()) {
+  if (!renderbuffer->RegenerateAndBindBackingObjectIfNeeded(workarounds())) {
     return false;
   }