Fix error msg of OffscreenCanvas.commit() on gpu compositing

third_party/WebKit/Source/platform/graphics/OffscreenCanvasFrameDispatcherImpl.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/OffscreenCanvasFrameDispatcherImpl.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "platform/CrossThreadFunctional.h"
@@ skipping 103 matching lines @@
                                             info.minRowBytes(), 0, 0);
 
   GLuint textureId = 0u;
   gl->GenTextures(1, &textureId);
   gl->BindTexture(GL_TEXTURE_2D, textureId);
   GLenum format =
       (kN32_SkColorType == kRGBA_8888_SkColorType) ? GL_RGBA : GL_BGRA_EXT;
   gl->TexImage2D(GL_TEXTURE_2D, 0, format, m_width, m_height, 0, format,
                  GL_UNSIGNED_BYTE, 0);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+  gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   gl->TexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_width, m_height, format,
                     GL_UNSIGNED_BYTE, dstPixels->data());
 
   gpu::Mailbox mailbox;
   gl->GenMailboxCHROMIUM(mailbox.name);
   gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
 
   const GLuint64 fenceSync = gl->InsertFenceSyncCHROMIUM();
@@ skipping 92 matching lines @@
   pass->SetNew(renderPassId, bounds, bounds, gfx::Transform());
 
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
   sqs->SetAll(gfx::Transform(), bounds.size(), bounds, bounds, false, 1.f,
               SkBlendMode::kSrcOver, 0);
 
   cc::TransferableResource resource;
   resource.id = m_nextResourceId;
   resource.format = cc::ResourceFormat::RGBA_8888;
   resource.size = gfx::Size(m_width, m_height);
+  // This indicates the filtering on the resource inherently, not the desired
+  // filtering effect on the quad.
+  resource.filter = GL_NEAREST;
   // TODO(crbug.com/646022): making this overlay-able.
   resource.is_overlay_candidate = false;
 
   bool yflipped = false;
   OffscreenCanvasCommitType commitType;
   DEFINE_THREAD_SAFE_STATIC_LOCAL(
       EnumerationHistogram, commitTypeHistogram,
       new EnumerationHistogram("OffscreenCanvas.CommitType",
                                OffscreenCanvasCommitTypeCount));
   if (image->isTextureBacked()) {
@@ skipping 165 matching lines @@
   client()->beginFrame();
   // TODO(eseckler): Tell |m_sink| if we did not draw during the BeginFrame.
   m_currentBeginFrameAck.sequence_number =
       cc::BeginFrameArgs::kInvalidFrameNumber;
 }
 
 void OffscreenCanvasFrameDispatcherImpl::ReclaimResources(
     const cc::ReturnedResourceArray& resources) {
   for (const auto& resource : resources) {
     RefPtr<StaticBitmapImage> image = m_cachedImages.at(resource.id);
-
     if (image) {
       if (image->hasMailbox()) {
         image->updateSyncToken(resource.sync_token);
       } else if (SharedGpuContext::isValid() && resource.sync_token.HasData()) {
         // Although image has MailboxTextureHolder at the time when it is
         // inserted to m_cachedImages, the
         // OffscreenCanvasPlaceHolder::placeholderFrame() exposes this image to
         // everyone accessing the placeholder canvas as an image source, some of
         // which may want to consume the image as a SkImage, thereby converting
         // the MailTextureHolder to a SkiaTextureHolder. In this case, we
@@ skipping 37 matching lines @@
 
 void OffscreenCanvasFrameDispatcherImpl::reshape(int width, int height) {
   if (m_width != width || m_height != height) {
     m_width = width;
     m_height = height;
     m_changeSizeForNextCommit = true;
   }
 }
 
 }  // namespace blink