Revert of Handle pointer-events: none in browser process hittesting.

content/renderer/child_frame_compositing_helper.h

Index: content/renderer/child_frame_compositing_helper.h
diff --git a/content/renderer/child_frame_compositing_helper.h b/content/renderer/child_frame_compositing_helper.h
index 707955cafa8b7ef7cc15f3241f040e3fb25bd0ad..d2d4e78cda2510a40c87334415d1d23c5db862c5 100644
--- a/content/renderer/child_frame_compositing_helper.h
+++ b/content/renderer/child_frame_compositing_helper.h
@@ -15,7 +15,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
-#include "cc/surfaces/surface_id.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -24,6 +23,7 @@
 }
 
 namespace cc {
+struct SurfaceId;
 struct SurfaceSequence;
 
 class CompositorFrame;
@@ -78,8 +78,6 @@
                     const cc::SurfaceSequence& sequence);
   void UpdateVisibility(bool);
   void ChildFrameGone();
-
-  cc::SurfaceId surface_id() const { return surface_id_; }
 
   // cc::DelegatedFrameProviderClient implementation.
   void UnusedResourcesAreAvailable() override;
@@ -148,7 +146,6 @@
   scoped_refptr<cc::DelegatedFrameProvider> frame_provider_;
 
   scoped_ptr<blink::WebLayer> web_layer_;
-  cc::SurfaceId surface_id_;
   blink::WebFrame* frame_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);