Roll chromium_revision d66326c..4df108a (367167:367307)

talk/media/devices/carbonvideorenderer.cc

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 22 matching lines @@
 #include "talk/media/base/videoframe.h"
 #include "webrtc/base/logging.h"
 
 namespace cricket {
 
 CarbonVideoRenderer::CarbonVideoRenderer(int x, int y)
     : image_width_(0),
       image_height_(0),
       x_(x),
       y_(y),
-      image_ref_(NULL),
       window_ref_(NULL) {
 }
 
 CarbonVideoRenderer::~CarbonVideoRenderer() {
   if (window_ref_) {
     DisposeWindow(window_ref_);
   }
 }
 
 // Called from the main event loop. All renderering needs to happen on
@@ skipping 127 matching lines @@
   if (err != noErr) {
     LOG(LS_ERROR) << "Failed to install event handler, error code: " << err;
     return false;
   }
   SelectWindow(window_ref_);
   ShowWindow(window_ref_);
   return true;
 }
 
 }  // namespace cricket