Stopgap fix for crash in issue 53867 comment 15

webkit/glue/webmediaplayer_impl.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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains PipelineImpl which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // PipelineImpl would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 151 matching lines @@
   // 3. FFmpeg video decoder
   // 4. Video renderer
   // 5. Null audio renderer
   // The video renderer provided by this class is using the graphics context
   // provided by WebKit to perform renderering. The simple data source does
   // resource loading by loading the whole resource object into memory. Null
   // audio renderer is a fake audio device that plays silence. Provider of the
   // |collection| can override the default filters by adding extra filters to
   // |collection| before calling this method.
   //
+  // Callers must call |initialization()| before they can use the object.

[scherkus (not reviewing), 2010/12/01 06:37:55]

|initialization()| -> initialize()

[Nico, 2010/12/01 06:46:04]

Done.

   WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
-                     media::MediaFilterCollection* collection,
-                     MediaResourceLoaderBridgeFactory* bridge_factory_simple,
-                     MediaResourceLoaderBridgeFactory* bridge_factory_buffered,
-                     bool use_simple_data_source,
-                     scoped_refptr<WebVideoRenderer> web_video_renderer);
+                     media::MediaFilterCollection* collection);
   virtual ~WebMediaPlayerImpl();
 
+  // Finalizes initialization of the object.
+  bool initialize(

[scherkus (not reviewing), 2010/12/01 06:37:55]

nit: actually this method can be Chromium styled (i.e., Initialize vs.
initialize)

the camelCase methods are due to implementing WebMediaPlayer interface, but
since we don't really want to have to change that interface we can simply go
with Initialize() with a capital I

[Nico, 2010/12/01 06:46:04]

Done.

+    MediaResourceLoaderBridgeFactory* bridge_factory_simple,

[scherkus (not reviewing), 2010/12/01 06:37:55]

nit: indent by 4 spaces

[Nico, 2010/12/01 06:46:04]

Done.

+    MediaResourceLoaderBridgeFactory* bridge_factory_buffered,
+    bool use_simple_data_source,
+    scoped_refptr<WebVideoRenderer> web_video_renderer);
+
   virtual void load(const WebKit::WebURL& url);
   virtual void cancelLoad();
 
   // Playback controls.
   virtual void play();
   virtual void pause();
   virtual bool supportsFullscreen() const;
   virtual bool supportsSave() const;
   virtual void seek(float seconds);
   virtual void setEndTime(float seconds);
@@ skipping 123 matching lines @@
 #if WEBKIT_USING_CG
   scoped_ptr<skia::PlatformCanvas> skia_canvas_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBMEDIAPLAYER_IMPL_H_