cc: Avoid extra flush calls to Skia GrContext

cc/resources/resource_provider.cc

 // Copyright 2012 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 "cc/resources/resource_provider.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 979 matching lines @@
       resource_provider_->GrContext(use_worker_context);
   uint32_t flags =
       use_distance_field_text ? SkSurfaceProps::kUseDistanceFieldFonts_Flag : 0;
   // Use unknown pixel geometry to disable LCD text.
   SkSurfaceProps surface_props(flags, kUnknown_SkPixelGeometry);
   if (can_use_lcd_text) {
     // LegacyFontHost will get LCD text and skia figures out what type to use.
     surface_props =
         SkSurfaceProps(flags, SkSurfaceProps::kLegacyFontHost_InitType);
   }
-  sk_surface_ = skia::AdoptRef(
-      SkSurface::NewWrappedRenderTarget(gr_context, desc, &surface_props));
+  gr_surface_ =
+      skia::AdoptRef(gr_context->textureProvider()->wrapBackendTexture(
+          desc, kBorrow_GrWrapOwnership));
+  if (gr_surface_)
+    sk_surface_ = skia::AdoptRef(SkSurface::NewRenderTargetDirect(
+        gr_surface_->asRenderTarget(), &surface_props));
 }
 
 void ResourceProvider::ScopedWriteLockGr::ReleaseSkSurface() {
+  DCHECK(gr_surface_);
+  gr_surface_->prepareForExternalIO();
+  gr_surface_.clear();
   sk_surface_.clear();
 }
 
 ResourceProvider::SynchronousFence::SynchronousFence(
     gpu::gles2::GLES2Interface* gl)
     : gl_(gl), has_synchronized_(true) {
 }
 
 ResourceProvider::SynchronousFence::~SynchronousFence() {
 }
@@ skipping 773 matching lines @@
 
     const int kImportance = 2;
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid, kImportance);
   }
 
   return true;
 }
 
 }  // namespace cc