| 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 10 matching lines...) Expand all Loading... |
| 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "core/platform/graphics/chromium/Canvas2DLayerBridge.h" | 28 #include "core/platform/graphics/chromium/Canvas2DLayerBridge.h" |
| 29 | 29 |
| 30 #include "GrContext.h" | 30 #include "GrContext.h" |
| 31 #include "GraphicsContext3DPrivate.h" | |
| 32 #include "SkDevice.h" | 31 #include "SkDevice.h" |
| 33 #include "TraceEvent.h" | 32 #include "core/platform/chromium/TraceEvent.h" |
| 33 #include "core/platform/chromium/support/GraphicsContext3DPrivate.h" |
| 34 #include "core/platform/graphics/GraphicsContext3D.h" | 34 #include "core/platform/graphics/GraphicsContext3D.h" |
| 35 #include "core/platform/graphics/chromium/Canvas2DLayerManager.h" | 35 #include "core/platform/graphics/chromium/Canvas2DLayerManager.h" |
| 36 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h" | 36 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h" |
| 37 #include <public/Platform.h> | 37 #include <public/Platform.h> |
| 38 #include <public/WebCompositorSupport.h> | 38 #include <public/WebCompositorSupport.h> |
| 39 #include <public/WebGraphicsContext3D.h> | 39 #include <public/WebGraphicsContext3D.h> |
| 40 | 40 |
| 41 using WebKit::WebExternalTextureLayer; | 41 using WebKit::WebExternalTextureLayer; |
| 42 using WebKit::WebGraphicsContext3D; | 42 using WebKit::WebGraphicsContext3D; |
| 43 using WebKit::WebTextureUpdater; | 43 using WebKit::WebTextureUpdater; |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 unsigned Canvas2DLayerBridge::backBufferTexture() | 175 unsigned Canvas2DLayerBridge::backBufferTexture() |
| 176 { | 176 { |
| 177 contextAcquired(); | 177 contextAcquired(); |
| 178 if (m_canvas) | 178 if (m_canvas) |
| 179 m_canvas->flush(); | 179 m_canvas->flush(); |
| 180 m_context->flush(); | 180 m_context->flush(); |
| 181 return m_backBufferTexture; | 181 return m_backBufferTexture; |
| 182 } | 182 } |
| 183 | 183 |
| 184 } | 184 } |
| OLD | NEW |