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

Side by Side Diff: components/exo/buffer.cc

Issue 1970833002: Fix include path for moved thread_task_runner_handle.h header in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393009 Created 4 years, 7 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 | « components/drive/sync_client_unittest.cc ('k') | components/favicon/core/favicon_service.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/exo/buffer.h" 5 #include "components/exo/buffer.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <GLES2/gl2.h>
8 #include <GLES2/gl2ext.h> 8 #include <GLES2/gl2ext.h>
9 #include <GLES2/gl2extchromium.h> 9 #include <GLES2/gl2extchromium.h>
10 #include <stdint.h> 10 #include <stdint.h>
11 11
12 #include <algorithm> 12 #include <algorithm>
13 #include <utility> 13 #include <utility>
14 14
15 #include "base/callback_helpers.h" 15 #include "base/callback_helpers.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/memory/ptr_util.h" 18 #include "base/memory/ptr_util.h"
19 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
20 #include "base/thread_task_runner_handle.h" 20 #include "base/threading/thread_task_runner_handle.h"
21 #include "base/time/time.h" 21 #include "base/time/time.h"
22 #include "base/trace_event/trace_event.h" 22 #include "base/trace_event/trace_event.h"
23 #include "base/trace_event/trace_event_argument.h" 23 #include "base/trace_event/trace_event_argument.h"
24 #include "cc/output/context_provider.h" 24 #include "cc/output/context_provider.h"
25 #include "cc/resources/single_release_callback.h" 25 #include "cc/resources/single_release_callback.h"
26 #include "cc/resources/texture_mailbox.h" 26 #include "cc/resources/texture_mailbox.h"
27 #include "gpu/command_buffer/client/context_support.h" 27 #include "gpu/command_buffer/client/context_support.h"
28 #include "gpu/command_buffer/client/gles2_interface.h" 28 #include "gpu/command_buffer/client/gles2_interface.h"
29 #include "ui/aura/env.h" 29 #include "ui/aura/env.h"
30 #include "ui/compositor/compositor.h" 30 #include "ui/compositor/compositor.h"
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 } 488 }
489 489
490 void Buffer::ReleaseContentsTexture(std::unique_ptr<Texture> texture) { 490 void Buffer::ReleaseContentsTexture(std::unique_ptr<Texture> texture) {
491 TRACE_EVENT0("exo", "Buffer::ReleaseContentsTexture"); 491 TRACE_EVENT0("exo", "Buffer::ReleaseContentsTexture");
492 492
493 contents_texture_ = std::move(texture); 493 contents_texture_ = std::move(texture);
494 Release(); 494 Release();
495 } 495 }
496 496
497 } // namespace exo 497 } // namespace exo
OLDNEW
« no previous file with comments | « components/drive/sync_client_unittest.cc ('k') | components/favicon/core/favicon_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698