Merge 49131 - Add rgb_frame size tracking and resizing to fix security issue ...

chrome/browser/renderer_host/video_layer_x.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_H_
 #define CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_H_
 
 #include "app/x11_util.h"
 #include "chrome/browser/renderer_host/video_layer.h"
 
@@ skipping 24 matching lines @@
 
   // Handle to the server side pixmap which is our video layer.
   XID pixmap_;
   // Graphics context for painting our video layer.
   void* pixmap_gc_;
   // Server side bits-per-pixel for |pixmap_|.
   int pixmap_bpp_;
 
   // Most recently converted frame stored as 32-bit ARGB.
   scoped_array<uint8> rgb_frame_;
+  size_t rgb_frame_size_;
+
   // Destination size and absolution position of the converted frame.
   gfx::Rect rgb_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoLayerX);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_X_H_