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

content/renderer/child_frame_compositing_helper.h

 // 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.
 
 #ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #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"
 
 namespace base {
 class SharedMemory;
 }
 
 namespace cc {
+struct SurfaceId;
 struct SurfaceSequence;
 
 class CompositorFrame;
 class Layer;
 class SolidColorLayer;
 class SurfaceLayer;
 class DelegatedFrameProvider;
 class DelegatedFrameResourceCollection;
 class DelegatedRendererLayer;
 }
@@ skipping 35 matching lines @@
                                 uint32_t output_surface_id,
                                 int host_id,
                                 base::SharedMemoryHandle handle);
   void OnSetSurface(const cc::SurfaceId& surface_id,
                     const gfx::Size& frame_size,
                     float scale_factor,
                     const cc::SurfaceSequence& sequence);
   void UpdateVisibility(bool);
   void ChildFrameGone();
 
-  cc::SurfaceId surface_id() const { return surface_id_; }
-
   // cc::DelegatedFrameProviderClient implementation.
   void UnusedResourcesAreAvailable() override;
 
  protected:
   // Friend RefCounted so that the dtor can be non-public.
   friend class base::RefCounted<ChildFrameCompositingHelper>;
 
  private:
   ChildFrameCompositingHelper(
       const base::WeakPtr<BrowserPlugin>& browser_plugin,
@@ skipping 47 matching lines @@
   // The lifetime of this weak pointer should be greater than the lifetime of
   // other member objects, as they may access this pointer during their
   // destruction.
   base::WeakPtr<BrowserPlugin> browser_plugin_;
   RenderFrameProxy* render_frame_proxy_;
 
   scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_;
   scoped_refptr<cc::DelegatedFrameProvider> frame_provider_;
 
   scoped_ptr<blink::WebLayer> web_layer_;
-  cc::SurfaceId surface_id_;
   blink::WebFrame* frame_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_