Changing UpdateStreamPacket protobuf definition for chromoting

remoting/client/x11_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/client/x11_view.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xcomposite.h>
 
 #include "base/logging.h"
 #include "remoting/client/decoder_verbatim.h"
 
 namespace remoting {
 
 X11View::X11View(Display* display, XID window, int width, int height)
     : display_(display),
       window_(window),
       width_(width),
       height_(height),
       picture_(0) {
+  media::VideoFrame::CreateFrame(media::VideoFrame::RGB32, width_, height_,
+                                 base::TimeDelta(), base::TimeDelta(), &frame_);
+  DCHECK(frame_);
 }
 
 X11View::~X11View() {
 }
 
 void X11View::Paint() {
   // TODO(hclam): Paint only the updated regions.
   all_update_rects_.clear();
 
   // If we have not initialized the render target then do it now.
-  if (!frame_)
+  if (!picture_)
     InitPaintTarget();
 
   // Upload the image to a pixmap. And then create a picture from the pixmap
   // and composite the picture over the picture representing the window.
 
   // Creates a XImage.
   XImage image;
   memset(&image, 0, sizeof(image));
   image.width = width_;
   image.height = height_;
@@ skipping 61 matching lines @@
   XWindowAttributes attr;
   XGetWindowAttributes(display_, window_, &attr);
 
   XRenderPictFormat* pictformat = XRenderFindVisualFormat(
       display_,
       attr.visual);
   CHECK(pictformat) << "XRENDER does not support default visual";
 
   picture_ = XRenderCreatePicture(display_, window_, pictformat, 0, NULL);
   CHECK(picture_) << "Backing picture not created";
-
-  // Create the video frame to carry the decoded image.
-  media::VideoFrame::CreateFrame(media::VideoFrame::RGB32, width_, height_,
-                                 base::TimeDelta(), base::TimeDelta(), &frame_);
-  DCHECK(frame_);
 }
 
 void X11View::HandleBeginUpdateStream(HostMessage* msg) {
   scoped_ptr<HostMessage> deleter(msg);
 
   // TODO(hclam): Use the information from the message to create the decoder.
   // We lazily construct the decoder.
   if (!decoder_.get()) {
     decoder_.reset(new DecoderVerbatim());
   }
@@ skipping 34 matching lines @@
   XEvent event;
   event.type = Expose;
   XSendEvent(display_, static_cast<int>(window_), true, ExposureMask, &event);
 }
 
 void X11View::OnDecodeDone() {
   // Since we do synchronous decoding here there's nothing in this method.
 }
 
 }  // namespace remoting