Enable accelerated WebKit compositor for Aura.

chrome/browser/renderer_host/render_widget_host_view_views.h

 // Copyright (c) 2011 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 CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 12 matching lines @@
 #include "views/events/event.h"
 #include "views/ime/text_input_client.h"
 #include "views/touchui/touch_selection_controller.h"
 #include "views/view.h"
 #include "webkit/glue/webcursor.h"
 
 #if defined(TOUCH_UI)
 namespace ui {
 enum TouchStatus;
 }
+#endif
+
+#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 class AcceleratedSurfaceContainerTouch;
 #endif
 
 class RenderWidgetHost;
 struct NativeWebKeyboardEvent;
 
 // -----------------------------------------------------------------------------
 // See comments in render_widget_host_view.h about this class and its members.
 // -----------------------------------------------------------------------------
 class RenderWidgetHostViewViews : public RenderWidgetHostView,
-#if defined(TOUCH_UI)
+#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
                                   public ui::CompositorObserver,
 #endif
                                   public views::TouchSelectionClientView,
                                   public views::TextInputClient,
                                   public NotificationObserver {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   explicit RenderWidgetHostViewViews(RenderWidgetHost* widget);
@@ skipping 120 matching lines @@
   virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;
   virtual bool DeleteRange(const ui::Range& range) OVERRIDE;
   virtual bool GetTextFromRange(
       const ui::Range& range,
       const base::Callback<void(const string16&)>& callback) OVERRIDE;
   virtual void OnInputMethodChanged() OVERRIDE;
   virtual bool ChangeTextDirectionAndLayoutAlignment(
       base::i18n::TextDirection direction) OVERRIDE;
   virtual views::View* GetOwnerViewOfTextInputClient() OVERRIDE;
 
-#if defined(TOUCH_UI)
+#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   virtual void AcceleratedSurfaceNew(
       int32 width,
       int32 height,
       uint64* surface_id,
       TransportDIB::Handle* surface_handle) OVERRIDE;
   virtual void AcceleratedSurfaceBuffersSwapped(
       uint64 surface_id,
       int32 route_id,
       int gpu_host_id) OVERRIDE;
   virtual void AcceleratedSurfaceRelease(uint64 surface_id) OVERRIDE;
@@ skipping 92 matching lines @@
   ui::TextInputType text_input_type_;
 
   // The current caret bounds.
   gfx::Rect caret_bounds_;
 
   // Indicates if there is onging composition text.
   bool has_composition_text_;
 
   string16 tooltip_text_;
 
-#if defined(TOUCH_UI)
+#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   std::vector< base::Callback<void(void)> > on_compositing_ended_callbacks_;
 #endif
 
   scoped_ptr<views::TouchSelectionController> touch_selection_controller_;
   gfx::Point selection_start_;
   gfx::Point selection_end_;
   ScopedRunnableMethodFactory<RenderWidgetHostViewViews>
       update_touch_selection_;
 
 #if defined(TOUCH_UI)
   // used to register for keyboard visiblity notificatons.
   NotificationRegistrar registrar_;
   gfx::Rect keyboard_rect_;
+#endif
+
+#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerTouch> >
       accelerated_surface_containers_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_