| 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/string_util.h" | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 43     producer_(producer), | 43     producer_(producer), | 
| 44     merge_buffer_(NULL), | 44     merge_buffer_(NULL), | 
| 45     merge_clip_area_(SkIRect::MakeEmpty()), | 45     merge_clip_area_(SkIRect::MakeEmpty()), | 
| 46     view_size_(SkISize::Make(0, 0)), | 46     view_size_(SkISize::Make(0, 0)), | 
| 47     clip_area_(SkIRect::MakeEmpty()), | 47     clip_area_(SkIRect::MakeEmpty()), | 
| 48     source_size_(SkISize::Make(0, 0)), | 48     source_size_(SkISize::Make(0, 0)), | 
| 49     source_dpi_(SkIPoint::Make(0, 0)), | 49     source_dpi_(SkIPoint::Make(0, 0)), | 
| 50     view_size_dips_(SkISize::Make(0, 0)), | 50     view_size_dips_(SkISize::Make(0, 0)), | 
| 51     view_scale_(1.0f), | 51     view_scale_(1.0f), | 
| 52     flush_pending_(false), | 52     flush_pending_(false), | 
|  | 53     is_initialized_(false), | 
| 53     frame_received_(false) { | 54     frame_received_(false) { | 
| 54   InitiateDrawing(); | 55   InitiateDrawing(); | 
| 55 } | 56 } | 
| 56 | 57 | 
| 57 PepperView::~PepperView() { | 58 PepperView::~PepperView() { | 
| 58   // The producer should now return any pending buffers. At this point, however, | 59   // The producer should now return any pending buffers. At this point, however, | 
| 59   // ReturnBuffer() tasks scheduled by the producer will not be delivered, | 60   // ReturnBuffer() tasks scheduled by the producer will not be delivered, | 
| 60   // so we free all the buffers once the producer's queue is empty. | 61   // so we free all the buffers once the producer's queue is empty. | 
| 61   base::WaitableEvent done_event(true, false); | 62   base::WaitableEvent done_event(true, false); | 
| 62   producer_->RequestReturnBuffers( | 63   producer_->RequestReturnBuffers( | 
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 275 | 276 | 
| 276   // If there is a buffer queued for rendering then render it now. | 277   // If there is a buffer queued for rendering then render it now. | 
| 277   if (merge_buffer_ != NULL) { | 278   if (merge_buffer_ != NULL) { | 
| 278     buffer = merge_buffer_; | 279     buffer = merge_buffer_; | 
| 279     merge_buffer_ = NULL; | 280     merge_buffer_ = NULL; | 
| 280     FlushBuffer(merge_clip_area_, buffer, merge_region_); | 281     FlushBuffer(merge_clip_area_, buffer, merge_region_); | 
| 281   } | 282   } | 
| 282 } | 283 } | 
| 283 | 284 | 
| 284 }  // namespace remoting | 285 }  // namespace remoting | 
| OLD | NEW | 
|---|