Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / cc / trees / layer_tree_host.h

diff --git a/src/cc/trees/layer_tree_host.h b/src/cc/trees/layer_tree_host.h
index 98ac83d..380cc95 100644 (file)
--- a/src/cc/trees/layer_tree_host.h
+++ b/src/cc/trees/layer_tree_host.h
@@ -65,7 +65,6 @@ struct ScrollAndScaleSet;
 struct CC_EXPORT RendererCapabilities {
   RendererCapabilities(ResourceFormat best_texture_format,
                        bool allow_partial_texture_updates,
-                       bool using_offscreen_context3d,
                        int max_texture_size,
                        bool using_shared_memory_resources);
 
@@ -75,7 +74,6 @@ struct CC_EXPORT RendererCapabilities {
   // Duplicate any modification to this list to RendererCapabilitiesImpl.
   ResourceFormat best_texture_format;
   bool allow_partial_texture_updates;
-  bool using_offscreen_context3d;
   int max_texture_size;
   bool using_shared_memory_resources;
 };
@@ -98,11 +96,6 @@ class CC_EXPORT LayerTreeHost {
 
   void SetLayerTreeHostClientReady();
 
-  void set_needs_filter_context() { needs_filter_context_ = true; }
-  bool needs_offscreen_context() const {
-    return needs_filter_context_;
-  }
-
   // LayerTreeHost interface to Proxy.
   void WillBeginMainFrame() {
     client_->WillBeginMainFrame(source_frame_number_);
@@ -121,17 +114,10 @@ class CC_EXPORT LayerTreeHost {
       LayerTreeHostImplClient* client);
   void DidLoseOutputSurface();
   bool output_surface_lost() const { return output_surface_lost_; }
-  enum CreateResult {
-    CreateSucceeded,
-    CreateFailedButTryAgain,
-    CreateFailedAndGaveUp,
-  };
-  virtual CreateResult OnCreateAndInitializeOutputSurfaceAttempted(
-      bool success);
+  virtual void OnCreateAndInitializeOutputSurfaceAttempted(bool success);
   void DidCommitAndDrawFrame() { client_->DidCommitAndDrawFrame(); }
   void DidCompleteSwapBuffers() { client_->DidCompleteSwapBuffers(); }
   void DeleteContentsTexturesOnImplThread(ResourceProvider* resource_provider);
-  virtual void AcquireLayerTextures();
   // Returns false if we should abort this frame due to initialization failure.
   bool InitializeOutputSurfaceIfNeeded();
   bool UpdateLayers(ResourceUpdateQueue* queue);
@@ -205,6 +191,14 @@ class CC_EXPORT LayerTreeHost {
   void SetDebugState(const LayerTreeDebugState& debug_state);
   const LayerTreeDebugState& debug_state() const { return debug_state_; }
 
+  bool has_gpu_rasterization_trigger() const {
+    return has_gpu_rasterization_trigger_;
+  }
+  void set_has_gpu_rasterization_trigger(bool has_trigger) {
+    has_gpu_rasterization_trigger_ = has_trigger;
+  }
+  bool UseGpuRasterization() const;
+
   void SetViewportSize(const gfx::Size& device_viewport_size);
   void SetOverdrawBottomHeight(float overdraw_bottom_height);
 
@@ -367,7 +361,6 @@ class CC_EXPORT LayerTreeHost {
 
   bool animating_;
   bool needs_full_tree_sync_;
-  bool needs_filter_context_;
 
   base::CancelableClosure prepaint_callback_;
 
@@ -406,6 +399,8 @@ class CC_EXPORT LayerTreeHost {
   float max_page_scale_factor_;
   gfx::Transform impl_transform_;
   bool trigger_idle_updates_;
+  bool has_gpu_rasterization_trigger_;
+  bool content_is_suitable_for_gpu_rasterization_;
 
   SkColor background_color_;
   bool has_transparent_background_;