Encrypted Media: Support natural size in video decrypt-and-decode path.

webkit/plugins/ppapi/content_decryptor_delegate.h

 // Copyright (c) 2012 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 WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
 #define WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/decryptor.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/c/private/ppp_content_decryptor_private.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/size.h"

[ddorwin, 2012/12/01 04:44:41]

We shouldn't need two includes for a single type.

[xhwang, 2012/12/01 05:38:43]

Done.

 #include "webkit/plugins/webkit_plugins_export.h"
 
 namespace media {
 class AudioDecoderConfig;
 class DecoderBuffer;
 class DecryptorClient;
 class VideoDecoderConfig;
 }
 
 namespace webkit {
@@ skipping 81 matching lines @@
   // Returns true upon success and false if any error happened.
   bool MakeMediaBufferResource(media::Decryptor::StreamType stream_type,
                                const uint8* data, int size,
                                ::ppapi::ScopedPPResource* resource);
 
   const PP_Instance pp_instance_;
   const PPP_ContentDecryptor_Private* const plugin_decryption_interface_;
 
   media::DecryptorClient* decryptor_client_;
 
+  gfx::Size natural_size_;
+
   // Request ID for tracking pending content decryption callbacks.
   // Note that zero indicates an invalid request ID.
   // TODO(xhwang): Add completion callbacks for Reset/Stop and remove the use
   // of request IDs.
   uint32_t next_decryption_request_id_;
 
   uint32_t pending_audio_decrypt_request_id_;
   media::Decryptor::DecryptCB pending_audio_decrypt_cb_;
 
   uint32_t pending_video_decrypt_request_id_;
@@ skipping 18 matching lines @@
   ::ppapi::ScopedPPResource video_input_resource_;
   int video_input_resource_size_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_