WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/platform/graphics/MediaPlayer.h

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 59 matching lines @@
     static void getSupportedTypes(HashSet<String>&);
     static bool isAvailable();
     
     IntSize naturalSize();
     bool hasVideo();
     
     void setFrameView(FrameView* frameView) { m_frameView = frameView; }
     FrameView* frameView() { return m_frameView; }
     bool inMediaDocument();
     
-    // FIXME: it would be better to just have a getter and setter for size.
-    // This is currently an absolute rect, which is not appropriate for
-    // content with transforms
-    IntRect rect() const { return m_rect; }
-    void setRect(const IntRect& r);
+    IntSize size() const { return m_size; }
+    void setSize(const IntSize& size);
     
     void load(const String& url, const ContentType& contentType);
     void cancelLoad();
     
     bool visible() const;
     void setVisible(bool);
     
     void play();
     void pause();    
     
@@ skipping 44 matching lines @@
     void setMediaPlayerProxy(WebMediaPlayerProxy* proxy);
 #endif
 
 private:
     static void initializeMediaEngines();
 
     MediaPlayerClient* m_mediaPlayerClient;
     OwnPtr<MediaPlayerPrivateInterface*> m_private;
     void* m_currentMediaEngine;
     FrameView* m_frameView;
-    IntRect m_rect;
+    IntSize m_size;
     bool m_visible;
     float m_rate;
     float m_volume;
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     WebMediaPlayerProxy* m_playerProxy;    // not owned or used, passed to m_private
 #endif
 };
 
 typedef MediaPlayerPrivateInterface* (*CreateMediaEnginePlayer)(MediaPlayer*);
 typedef void (*MediaEngineSupportedTypes)(HashSet<String>& types);
 typedef MediaPlayer::SupportsType (*MediaEngineSupportsType)(const String& type, const String& codecs);
 
 typedef void (*MediaEngineRegistrar)(CreateMediaEnginePlayer, MediaEngineSupportedTypes, MediaEngineSupportsType); 
 
 
 }
 
 #endif // ENABLE(VIDEO)
 
 #endif