Update from https://crrev.com/320343

cc/output/bsp_tree.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/output/bsp_tree.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/scoped_ptr_deque.h"
@@ skipping 44 matching lines @@
         front_list.push_back(polygon_list->take_front().Pass());
         break;
       case BSP_BACK:
         back_list.push_back(polygon_list->take_front().Pass());
         break;
       case BSP_SPLIT:
       {
         scoped_ptr<DrawPolygon> polygon;
         scoped_ptr<DrawPolygon> new_front;
         scoped_ptr<DrawPolygon> new_back;
-        bool split_result = false;
         // Time to split this geometry, *it needs to be split by node_data.
         polygon = polygon_list->take_front();
-        split_result =
+        bool split_result =
             polygon->Split(*(node->node_data), &new_front, &new_back);
         DCHECK(split_result);
         if (!split_result) {
           break;
         }
         front_list.push_back(new_front.Pass());
         back_list.push_back(new_back.Pass());
         break;
       }
       case BSP_COPLANAR_FRONT:
@@ skipping 32 matching lines @@
   if (node.normal().z() > 0.0f) {
     return BSP_FRONT;
   }
   return BSP_BACK;
 }
 
 BspTree::~BspTree() {
 }
 
 }  // namespace cc