Update from https://crrev.com/309415

cc/surfaces/surface_aggregator.cc

 // Copyright 2014 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/surfaces/surface_aggregator.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
@@ skipping 135 matching lines @@
 }
 
 bool SurfaceAggregator::TakeResources(Surface* surface,
                                       const DelegatedFrameData* frame_data,
                                       RenderPassList* render_pass_list) {
   RenderPass::CopyAll(frame_data->render_pass_list, render_pass_list);
   if (!provider_)  // TODO(jamesr): hack for unit tests that don't set up rp
     return false;
 
   int child_id = ChildIdForSurface(surface);
-  provider_->ReceiveFromChild(child_id, frame_data->resource_list);
   if (surface->factory())
     surface->factory()->RefResources(frame_data->resource_list);
+  provider_->ReceiveFromChild(child_id, frame_data->resource_list);
 
   typedef ResourceProvider::ResourceIdArray IdArray;
   IdArray referenced_resources;
 
   bool invalid_frame = false;
   DrawQuad::ResourceIteratorCallback remap =
       base::Bind(&ResourceRemapHelper,
                  &invalid_frame,
                  provider_->GetChildToParentMap(child_id),
                  &referenced_resources);
@@ skipping 317 matching lines @@
 void SurfaceAggregator::ReleaseResources(SurfaceId surface_id) {
   SurfaceToResourceChildIdMap::iterator it =
       surface_id_to_resource_child_id_.find(surface_id);
   if (it != surface_id_to_resource_child_id_.end()) {
     provider_->DestroyChild(it->second);
     surface_id_to_resource_child_id_.erase(it);
   }
 }
 
 }  // namespace cc