| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "ui/gfx/compositor/compositor_test_support.h" | 5 #include "ui/gfx/compositor/test/compositor_test_support.h" |
| 6 | 6 |
| 7 #if defined(USE_WEBKIT_COMPOSITOR) | 7 #if defined(USE_WEBKIT_COMPOSITOR) |
| 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
| 9 #include "webkit/glue/webkitplatformsupport_impl.h" | 9 #include "webkit/glue/webkitplatformsupport_impl.h" |
| 10 #endif | 10 #endif |
| 11 | 11 |
| 12 namespace ui { | 12 namespace ui { |
| 13 | 13 |
| 14 #if defined(USE_WEBKIT_COMPOSITOR) | 14 #if defined(USE_WEBKIT_COMPOSITOR) |
| 15 static webkit_glue::WebKitPlatformSupportImpl* g_webkit_support; | 15 static webkit_glue::WebKitPlatformSupportImpl* g_webkit_support; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 26 void CompositorTestSupport::Terminate() { | 26 void CompositorTestSupport::Terminate() { |
| 27 #if defined(USE_WEBKIT_COMPOSITOR) | 27 #if defined(USE_WEBKIT_COMPOSITOR) |
| 28 DCHECK(g_webkit_support); | 28 DCHECK(g_webkit_support); |
| 29 WebKit::shutdown(); | 29 WebKit::shutdown(); |
| 30 delete g_webkit_support; | 30 delete g_webkit_support; |
| 31 g_webkit_support = NULL; | 31 g_webkit_support = NULL; |
| 32 #endif | 32 #endif |
| 33 } | 33 } |
| 34 | 34 |
| 35 } // namespace ui | 35 } // namespace ui |
| OLD | NEW |