Replace VideoDecoder::media_format() with significantly simpler width()/height() methods.

webkit/glue/media/video_renderer_impl.cc

 // Copyright (c) 2011 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 "webkit/glue/media/video_renderer_impl.h"
 
 #include "media/base/video_frame.h"
 #include "media/base/yuv_convert.h"
 #include "webkit/glue/webmediaplayer_impl.h"
 
 namespace webkit_glue {
 
 VideoRendererImpl::VideoRendererImpl(bool pts_logging)
     : last_converted_frame_(NULL),
       pts_logging_(pts_logging) {
 }
 
 VideoRendererImpl::~VideoRendererImpl() {}
 
 bool VideoRendererImpl::OnInitialize(media::VideoDecoder* decoder) {
-  video_size_.SetSize(width(), height());
-  bitmap_.setConfig(SkBitmap::kARGB_8888_Config, width(), height());
-  if (bitmap_.allocPixels(NULL, NULL)) {
-    bitmap_.eraseRGB(0x00, 0x00, 0x00);
-    return true;
-  }
-
-  NOTREACHED();
-  return false;
+  video_size_.SetSize(decoder->width(), decoder->height());
+  bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
+                    decoder->width(), decoder->height());
+  bitmap_.allocPixels();

[Ami GONE FROM CHROMIUM, 2011/07/20 16:30:22]

CHECK it?

[scherkus (not reviewing), 2011/07/20 16:51:52]

most chromium code simply assumes the call will work

if allocation fails inside this method the whole process is killed anyway :(

[Ami GONE FROM CHROMIUM, 2011/07/20 16:56:26]

I wish code like this had a compile-time flag that s/bool/void/ for build
configs like chromium's.

+  bitmap_.eraseRGB(0x00, 0x00, 0x00);
+  return true;
 }
 
 void VideoRendererImpl::OnStop(media::FilterCallback* callback) {
   if (callback) {
     callback->Run();
     delete callback;
   }
 }
 
 void VideoRendererImpl::OnFrameAvailable() {
@@ skipping 267 matching lines @@
     // Transform destination rect to local coordinates.
     SkRect transformed_rect;
     SkRect skia_dest_rect;
     skia_dest_rect.iset(src_rect.x(), src_rect.y(),
                         src_rect.right(), src_rect.bottom());
     matrix.mapRect(&transformed_rect, skia_dest_rect);
     transformed_rect.round(dest_rect);
 }
 
 }  // namespace webkit_glue