OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 class WebGraphicsContext3D; | 53 class WebGraphicsContext3D; |
54 class WebGraphicsContext3DProvider; | 54 class WebGraphicsContext3DProvider; |
55 class SharedContextRateLimiter; | 55 class SharedContextRateLimiter; |
56 | 56 |
57 #if OS(MACOSX) | 57 #if OS(MACOSX) |
58 // Canvas hibernation is currently disabled on MacOS X due to a bug that causes
content loss | 58 // Canvas hibernation is currently disabled on MacOS X due to a bug that causes
content loss |
59 // TODO: Find a better fix for crbug.com/588434 | 59 // TODO: Find a better fix for crbug.com/588434 |
60 #define CANVAS2D_HIBERNATION_ENABLED 0 | 60 #define CANVAS2D_HIBERNATION_ENABLED 0 |
61 | 61 |
62 // IOSurfaces are a primitive only present on OS X. | 62 // IOSurfaces are a primitive only present on OS X. |
63 #define USE_IOSURFACE_FOR_2D_CANVAS 1 | 63 // TODO(erikchen): Re-enable this after debugging for |
| 64 // https://bugs.chromium.org/p/chromium/issues/detail?id=595754. |
| 65 #define USE_IOSURFACE_FOR_2D_CANVAS 0 |
64 #else | 66 #else |
65 #define CANVAS2D_HIBERNATION_ENABLED 1 | 67 #define CANVAS2D_HIBERNATION_ENABLED 1 |
66 #define USE_IOSURFACE_FOR_2D_CANVAS 0 | 68 #define USE_IOSURFACE_FOR_2D_CANVAS 0 |
67 #endif | 69 #endif |
68 | 70 |
69 class PLATFORM_EXPORT Canvas2DLayerBridge : public WebExternalTextureLayerClient
, public WebThread::TaskObserver, public RefCounted<Canvas2DLayerBridge> { | 71 class PLATFORM_EXPORT Canvas2DLayerBridge : public WebExternalTextureLayerClient
, public WebThread::TaskObserver, public RefCounted<Canvas2DLayerBridge> { |
70 WTF_MAKE_NONCOPYABLE(Canvas2DLayerBridge); | 72 WTF_MAKE_NONCOPYABLE(Canvas2DLayerBridge); |
71 public: | 73 public: |
72 enum AccelerationMode { | 74 enum AccelerationMode { |
73 DisableAcceleration, | 75 DisableAcceleration, |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 // Each element in this vector represents an IOSurface backed texture that | 266 // Each element in this vector represents an IOSurface backed texture that |
265 // is ready to be reused. | 267 // is ready to be reused. |
266 // Elements in this vector can safely be purged in low memory conditions. | 268 // Elements in this vector can safely be purged in low memory conditions. |
267 Vector<ImageInfo> m_imageInfoCache; | 269 Vector<ImageInfo> m_imageInfoCache; |
268 #endif // USE_IOSURFACE_FOR_2D_CANVAS | 270 #endif // USE_IOSURFACE_FOR_2D_CANVAS |
269 }; | 271 }; |
270 | 272 |
271 } // namespace blink | 273 } // namespace blink |
272 | 274 |
273 #endif | 275 #endif |
OLD | NEW |