| 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 <deque> | 5 #include <deque> | 
| 6 #include <stdlib.h> | 6 #include <stdlib.h> | 
| 7 | 7 | 
| 8 #include "base/bind.h" | 8 #include "base/bind.h" | 
| 9 #include "base/logging.h" | 9 #include "base/logging.h" | 
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" | 
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 58                      const DesktopSize& screen_size, | 58                      const DesktopSize& screen_size, | 
| 59                      const DesktopSize& view_size) | 59                      const DesktopSize& view_size) | 
| 60       : screen_size_(screen_size), | 60       : screen_size_(screen_size), | 
| 61         view_size_(view_size), | 61         view_size_(view_size), | 
| 62         strict_(false), | 62         strict_(false), | 
| 63         decoder_(decoder), | 63         decoder_(decoder), | 
| 64         frame_(nullptr) { | 64         frame_(nullptr) { | 
| 65     image_data_.reset(new uint8[ | 65     image_data_.reset(new uint8[ | 
| 66         view_size_.width() * view_size_.height() * kBytesPerPixel]); | 66         view_size_.width() * view_size_.height() * kBytesPerPixel]); | 
| 67     EXPECT_TRUE(image_data_.get()); | 67     EXPECT_TRUE(image_data_.get()); | 
| 68     decoder_->Initialize( |  | 
| 69         DesktopSize(screen_size_.width(), screen_size_.height())); |  | 
| 70   } | 68   } | 
| 71 | 69 | 
| 72   void Reset() { | 70   void Reset() { | 
| 73     expected_region_.Clear(); | 71     expected_region_.Clear(); | 
| 74     update_region_.Clear(); | 72     update_region_.Clear(); | 
| 75   } | 73   } | 
| 76 | 74 | 
| 77   void ResetRenderedData() { | 75   void ResetRenderedData() { | 
| 78     memset(image_data_.get(), 0, | 76     memset(image_data_.get(), 0, | 
| 79            view_size_.width() * view_size_.height() * kBytesPerPixel); | 77            view_size_.width() * view_size_.height() * kBytesPerPixel); | 
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 425 | 423 | 
| 426     if (frame_count >= kWarmUpFrameCount) { | 424     if (frame_count >= kWarmUpFrameCount) { | 
| 427       elapsed = base::TimeTicks::Now() - start_time; | 425       elapsed = base::TimeTicks::Now() - start_time; | 
| 428     } | 426     } | 
| 429   } | 427   } | 
| 430 | 428 | 
| 431   return (frame_count * base::TimeDelta::FromSeconds(1)) / elapsed; | 429   return (frame_count * base::TimeDelta::FromSeconds(1)) / elapsed; | 
| 432 } | 430 } | 
| 433 | 431 | 
| 434 }  // namespace remoting | 432 }  // namespace remoting | 
| OLD | NEW | 
|---|