Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Side by Side Diff: content/browser/renderer_host/compositor_impl_android.cc

Issue 1101403002: content: Cleanup the dependencies on webkit_gpu target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restrict gn too Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/renderer_host/compositor_impl_android.h" 5 #include "content/browser/renderer_host/compositor_impl_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 #include <android/native_window_jni.h> 8 #include <android/native_window_jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "content/public/browser/android/compositor_client.h" 51 #include "content/public/browser/android/compositor_client.h"
52 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" 52 #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h"
53 #include "gpu/command_buffer/client/context_support.h" 53 #include "gpu/command_buffer/client/context_support.h"
54 #include "gpu/command_buffer/client/gles2_interface.h" 54 #include "gpu/command_buffer/client/gles2_interface.h"
55 #include "third_party/khronos/GLES2/gl2.h" 55 #include "third_party/khronos/GLES2/gl2.h"
56 #include "third_party/khronos/GLES2/gl2ext.h" 56 #include "third_party/khronos/GLES2/gl2ext.h"
57 #include "third_party/skia/include/core/SkMallocPixelRef.h" 57 #include "third_party/skia/include/core/SkMallocPixelRef.h"
58 #include "ui/android/window_android.h" 58 #include "ui/android/window_android.h"
59 #include "ui/gfx/android/device_display_info.h" 59 #include "ui/gfx/android/device_display_info.h"
60 #include "ui/gfx/frame_time.h" 60 #include "ui/gfx/frame_time.h"
61 #include "webkit/common/gpu/context_provider_in_process.h"
62 61
63 namespace content { 62 namespace content {
64 63
65 namespace { 64 namespace {
66 65
67 const unsigned int kMaxSwapBuffers = 2U; 66 const unsigned int kMaxSwapBuffers = 2U;
68 67
69 // Used to override capabilities_.adjust_deadline_for_parent to false 68 // Used to override capabilities_.adjust_deadline_for_parent to false
70 class OutputSurfaceWithoutParent : public cc::OutputSurface { 69 class OutputSurfaceWithoutParent : public cc::OutputSurface {
71 public: 70 public:
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 722
724 void CompositorImpl::SetNeedsAnimate() { 723 void CompositorImpl::SetNeedsAnimate() {
725 needs_animate_ = true; 724 needs_animate_ = true;
726 if (!host_) 725 if (!host_)
727 return; 726 return;
728 727
729 host_->SetNeedsAnimate(); 728 host_->SetNeedsAnimate();
730 } 729 }
731 730
732 } // namespace content 731 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698