commit 1027bc1b6f8257f3581dec87b6c639a2787c8a83
author James Robinson <jamesr@chromium.org> Thu Dec 04 14:51:42 2014 -0800
committer James Robinson <jamesr@chromium.org> Thu Dec 04 14:51:42 2014 -0800
tree 7811925a3e0c7e8fb6847688c3419984a918ba42
parent 929339e06cacfa75f87053a3c29f0a17afe8db40

Update from https://crrev.com/306901

Includes changes for https://crrev.com/306768

Review URL: https://codereview.chromium.org/783543003

cc/resources/resource_provider.cc

diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index fe7cc00..c0e8f1b 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -615,7 +615,7 @@
                         gfx::Size(),
                         Resource::External,
                         mailbox.target(),
-                        GL_LINEAR,
+                        mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR,
                         0,
                         GL_CLAMP_TO_EDGE,
                         TextureHintImmutable,