Update from https://crrev.com/309717

cc/resources/scoped_gpu_raster.cc

Index: cc/resources/scoped_gpu_raster.cc
diff --git a/cc/resources/scoped_gpu_raster.cc b/cc/resources/scoped_gpu_raster.cc
index 9d1dfe53dc603cbdd5a3e60ee2cb96ac8edee26b..2f5c5c9c3426a42eca7532cb8919611884a983d1 100644
--- a/cc/resources/scoped_gpu_raster.cc
+++ b/cc/resources/scoped_gpu_raster.cc
@@ -34,11 +34,14 @@ void ScopedGpuRaster::BeginGpuRaster() {
 }
 
 void ScopedGpuRaster::EndGpuRaster() {
-  GLES2Interface* gl = context_provider_->ContextGL();
-
   class GrContext* gr_context = context_provider_->GrContext();
   gr_context->flush();
 
+  GLES2Interface* gl = context_provider_->ContextGL();
+
+  // Restore default GL unpack alignment.  TextureUploader expects this.
+  gl->PixelStorei(GL_UNPACK_ALIGNMENT, 4);
+
   // TODO(alokp): Use a trace macro to push/pop markers.
   // Using push/pop functions directly incurs cost to evaluate function
   // arguments even when tracing is disabled.