OLD | NEW |
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 "remoting/client/plugin/pepper_view.h" | 5 #include "remoting/client/plugin/pepper_view.h" |
6 | 6 |
7 #include <functional> | 7 #include <functional> |
8 | 8 |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/string_util.h" | 10 #include "base/strings/string_util.h" |
| 11 #include "base/synchronization/waitable_event.h" |
11 #include "base/time.h" | 12 #include "base/time.h" |
12 #include "base/synchronization/waitable_event.h" | |
13 #include "ppapi/cpp/completion_callback.h" | 13 #include "ppapi/cpp/completion_callback.h" |
14 #include "ppapi/cpp/dev/graphics_2d_dev.h" | 14 #include "ppapi/cpp/dev/graphics_2d_dev.h" |
15 #include "ppapi/cpp/dev/view_dev.h" | 15 #include "ppapi/cpp/dev/view_dev.h" |
16 #include "ppapi/cpp/image_data.h" | 16 #include "ppapi/cpp/image_data.h" |
17 #include "ppapi/cpp/point.h" | 17 #include "ppapi/cpp/point.h" |
18 #include "ppapi/cpp/rect.h" | 18 #include "ppapi/cpp/rect.h" |
19 #include "ppapi/cpp/size.h" | 19 #include "ppapi/cpp/size.h" |
20 #include "remoting/base/util.h" | 20 #include "remoting/base/util.h" |
21 #include "remoting/client/chromoting_stats.h" | 21 #include "remoting/client/chromoting_stats.h" |
22 #include "remoting/client/client_context.h" | 22 #include "remoting/client/client_context.h" |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 | 294 |
295 // If there is a buffer queued for rendering then render it now. | 295 // If there is a buffer queued for rendering then render it now. |
296 if (merge_buffer_ != NULL) { | 296 if (merge_buffer_ != NULL) { |
297 buffer = merge_buffer_; | 297 buffer = merge_buffer_; |
298 merge_buffer_ = NULL; | 298 merge_buffer_ = NULL; |
299 FlushBuffer(merge_clip_area_, buffer, merge_region_); | 299 FlushBuffer(merge_clip_area_, buffer, merge_region_); |
300 } | 300 } |
301 } | 301 } |
302 | 302 |
303 } // namespace remoting | 303 } // namespace remoting |
OLD | NEW |