Simplify VideoDecodeEngine interface by making everything synchronous.

media/base/video_decoder_config.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 "media/base/video_decoder_config.h"
 
 #include <cmath>
 
 #include "base/logging.h"
+#include "media/base/limits.h"
 
 namespace media {
 
 VideoDecoderConfig::VideoDecoderConfig()
     : codec_(kUnknownVideoCodec),
       format_(VideoFrame::INVALID),
       frame_rate_numerator_(0),
       frame_rate_denominator_(0),
       aspect_ratio_numerator_(0),
       aspect_ratio_denominator_(0),
@@ skipping 63 matching lines @@
   // expected by WebKit layout tests.
   natural_size_.SetSize(width & ~1, height);
 }
 
 bool VideoDecoderConfig::IsValidConfig() const {
   return codec_ != kUnknownVideoCodec &&
       format_ != VideoFrame::INVALID &&
       frame_rate_numerator_ > 0 &&
       frame_rate_denominator_ > 0 &&
       aspect_ratio_numerator_ > 0 &&
-      aspect_ratio_denominator_ > 0;
+      aspect_ratio_denominator_ > 0 &&
+      natural_size_.width() <= Limits::kMaxDimension &&
+      natural_size_.height() <= Limits::kMaxDimension &&
+      natural_size_.GetArea() <= Limits::kMaxCanvas;
 }
 
 VideoCodec VideoDecoderConfig::codec() const {
   return codec_;
 }
 
 VideoFrame::Format VideoDecoderConfig::format() const {
   return format_;
 }
 
@@ skipping 27 matching lines @@
 
 uint8* VideoDecoderConfig::extra_data() const {
   return extra_data_.get();
 }
 
 size_t VideoDecoderConfig::extra_data_size() const {
   return extra_data_size_;
 }
 
 }  // namespace media