| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTENT_LAYER_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTENT_LAYER_H_ |
| 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTENT_LAYER_H_ | 6 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTENT_LAYER_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "cc/output/filter_operations.h" |
| 10 #include "chrome/browser/android/compositor/layer/layer.h" | 11 #include "chrome/browser/android/compositor/layer/layer.h" |
| 11 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 12 #include "ui/gfx/geometry/size.h" | 13 #include "ui/gfx/geometry/size.h" |
| 13 | 14 |
| 14 namespace cc { | 15 namespace cc { |
| 15 class Layer; | 16 class Layer; |
| 16 } | 17 } |
| 17 | 18 |
| 18 namespace chrome { | 19 namespace chrome { |
| 19 namespace android { | 20 namespace android { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 void ClipContentLayer(scoped_refptr<cc::Layer> content_layer, | 55 void ClipContentLayer(scoped_refptr<cc::Layer> content_layer, |
| 55 gfx::Rect clipping, | 56 gfx::Rect clipping, |
| 56 gfx::Size content_size); | 57 gfx::Size content_size); |
| 57 void ClipStaticLayer(scoped_refptr<ThumbnailLayer> static_layer, | 58 void ClipStaticLayer(scoped_refptr<ThumbnailLayer> static_layer, |
| 58 gfx::Rect clipping); | 59 gfx::Rect clipping); |
| 59 | 60 |
| 60 scoped_refptr<cc::Layer> layer_; | 61 scoped_refptr<cc::Layer> layer_; |
| 61 scoped_refptr<ThumbnailLayer> static_layer_; | 62 scoped_refptr<ThumbnailLayer> static_layer_; |
| 62 bool content_attached_; | 63 bool content_attached_; |
| 63 bool static_attached_; | 64 bool static_attached_; |
| 64 float saturation_; | 65 |
| 65 float brightness_; | 66 cc::FilterOperations static_filter_operations_; |
| 67 cc::FilterOperations content_filter_operations_; |
| 66 | 68 |
| 67 TabContentManager* tab_content_manager_; | 69 TabContentManager* tab_content_manager_; |
| 68 | 70 |
| 69 DISALLOW_COPY_AND_ASSIGN(ContentLayer); | 71 DISALLOW_COPY_AND_ASSIGN(ContentLayer); |
| 70 }; | 72 }; |
| 71 | 73 |
| 72 } // namespace android | 74 } // namespace android |
| 73 } // namespace chrome | 75 } // namespace chrome |
| 74 | 76 |
| 75 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTENT_LAYER_H_ | 77 #endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTENT_LAYER_H_ |
| OLD | NEW |