Revert two cc patches due to crashes on canary.

cc/resources/picture_layer_tiling.h

Index: cc/resources/picture_layer_tiling.h
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index fba3df392ce9aaf1e94034a2da14706b035cb639..f6927027a8b7e80376a8e266548988d6ca2d8aee 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -41,10 +41,8 @@ class CC_EXPORT PictureLayerTilingClient {
   virtual PicturePileImpl* GetPile() = 0;
   virtual gfx::Size CalculateTileSize(
     const gfx::Size& content_bounds) const = 0;
-  // This invalidation region defines the area (if any, it can by null) that
-  // tiles can not be shared between pending and active trees.
-  virtual const Region* GetPendingInvalidation() = 0;
-  virtual const PictureLayerTiling* GetPendingOrActiveTwinTiling(
+  virtual const Region* GetInvalidation() = 0;
+  virtual const PictureLayerTiling* GetTwinTiling(
       const PictureLayerTiling* tiling) const = 0;
   virtual PictureLayerTiling* GetRecycledTwinTiling(
       const PictureLayerTiling* tiling) = 0;