| Index: content/renderer/gpu/render_widget_compositor.cc
|
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
|
| index 8c825053c48a4f123b9cf8d84ee97aa255eaa513..f1c65cdab79b47aa9895ee6dd55066a48eb4e4a3 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -29,7 +29,6 @@
|
| #include "build/build_config.h"
|
| #include "cc/animation/animation_host.h"
|
| #include "cc/animation/animation_timeline.h"
|
| -#include "cc/base/region.h"
|
| #include "cc/base/switches.h"
|
| #include "cc/blink/web_layer_impl.h"
|
| #include "cc/debug/layer_tree_debug_state.h"
|
| @@ -208,7 +207,6 @@
|
| compositor_deps_(compositor_deps),
|
| threaded_(!!compositor_deps_->GetCompositorImplThreadTaskRunner()),
|
| never_visible_(false),
|
| - is_for_oopif_(false),
|
| layout_and_paint_async_callback_(nullptr),
|
| weak_factory_(this) {}
|
|
|
| @@ -819,37 +817,6 @@
|
| static_cast<cc::EventListenerProperties>(properties));
|
| }
|
|
|
| -void RenderWidgetCompositor::updateTouchRectsForSubframeIfNecessary() {
|
| - if (!is_for_oopif_)
|
| - return;
|
| -
|
| - // If this is an oopif sub-frame compositor, we won't be getting TouchRects
|
| - // from ScrollingCoordinator, so to make sure touch events are handled
|
| - // properly, mark the entire root layer as a TouchRect.
|
| - // TODO(wjmaclean): remove this when ScrollingCoordinator is made per-frame,
|
| - // as opposed to per-page.
|
| - using blink::WebEventListenerProperties;
|
| - using blink::WebEventListenerClass;
|
| -
|
| - blink::WebEventListenerProperties touch_start_properties =
|
| - eventListenerProperties(WebEventListenerClass::TouchStartOrMove);
|
| - blink::WebEventListenerProperties touch_end_cancel_properties =
|
| - eventListenerProperties(WebEventListenerClass::TouchEndOrCancel);
|
| - bool has_touch_handlers =
|
| - touch_start_properties == WebEventListenerProperties::Blocking ||
|
| - touch_start_properties ==
|
| - WebEventListenerProperties::BlockingAndPassive ||
|
| - touch_end_cancel_properties == WebEventListenerProperties::Blocking ||
|
| - touch_end_cancel_properties ==
|
| - WebEventListenerProperties::BlockingAndPassive;
|
| -
|
| - cc::Layer* root_layer = layer_tree_host_->GetLayerTree()->root_layer();
|
| - cc::Region touch_handler_region;
|
| - if (has_touch_handlers)
|
| - touch_handler_region = gfx::Rect(gfx::Point(), root_layer->bounds());
|
| - root_layer->SetTouchEventHandlerRegion(touch_handler_region);
|
| -}
|
| -
|
| blink::WebEventListenerProperties
|
| RenderWidgetCompositor::eventListenerProperties(
|
| blink::WebEventListenerClass event_class) const {
|
| @@ -1121,8 +1088,4 @@
|
| layer_tree_host_->GetLayerTree()->SetDeviceColorSpace(color_space);
|
| }
|
|
|
| -void RenderWidgetCompositor::SetIsForOopif(bool is_for_oopif) {
|
| - is_for_oopif_ = is_for_oopif;
|
| -}
|
| -
|
| } // namespace content
|
|
|