| Index: remoting/client/gl_desktop.cc
|
| diff --git a/remoting/client/gl_desktop.cc b/remoting/client/gl_desktop.cc
|
| index 656e3bb6ea72fa79cca957fa0ba6c1e19ab683ce..0b405c992bbcc27dc2acc46af606337d0c460386 100644
|
| --- a/remoting/client/gl_desktop.cc
|
| +++ b/remoting/client/gl_desktop.cc
|
| @@ -30,22 +30,22 @@ void GlDesktop::SetCanvas(GlCanvas* canvas) {
|
| last_desktop_size_.set(0, 0);
|
| }
|
|
|
| -void GlDesktop::SetVideoFrame(std::unique_ptr<webrtc::DesktopFrame> frame) {
|
| +void GlDesktop::SetVideoFrame(const webrtc::DesktopFrame& frame) {
|
| if (!layer_) {
|
| return;
|
| }
|
| - if (!frame->size().equals(last_desktop_size_)) {
|
| - layer_->SetTexture(frame->data(), frame->size().width(),
|
| - frame->size().height());
|
| - last_desktop_size_.set(frame->size().width(), frame->size().height());
|
| + if (!frame.size().equals(last_desktop_size_)) {
|
| + layer_->SetTexture(frame.data(), frame.size().width(),
|
| + frame.size().height());
|
| + last_desktop_size_.set(frame.size().width(), frame.size().height());
|
| } else {
|
| - for (webrtc::DesktopRegion::Iterator i(frame->updated_region());
|
| + for (webrtc::DesktopRegion::Iterator i(frame.updated_region());
|
| !i.IsAtEnd(); i.Advance()) {
|
| const uint8_t* rect_start =
|
| - frame->GetFrameDataAtPos(i.rect().top_left());
|
| + frame.GetFrameDataAtPos(i.rect().top_left());
|
| layer_->UpdateTexture(
|
| rect_start, i.rect().left(), i.rect().top(), i.rect().width(),
|
| - i.rect().height(), frame->stride());
|
| + i.rect().height(), frame.stride());
|
| }
|
| }
|
| }
|
|
|