| Index: Source/core/html/HTMLMediaElement.h | 
| diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h | 
| index 3c331da4bfc147a9c39bf0596f635796007311bd..12d5508c2277f676c95f7de5c1488a6574f3e9d0 100644 | 
| --- a/Source/core/html/HTMLMediaElement.h | 
| +++ b/Source/core/html/HTMLMediaElement.h | 
| @@ -266,7 +266,7 @@ public: | 
| bool isSafeToLoadURL(const KURL&, InvalidURLAction); | 
|  | 
| MediaController* controller() const; | 
| -    void setController(PassRefPtr<MediaController>); // Resets the MediaGroup and sets the MediaController. | 
| +    void setController(PassRefPtrWillBeRawPtr<MediaController>); // Resets the MediaGroup and sets the MediaController. | 
|  | 
| void scheduleEvent(PassRefPtrWillBeRawPtr<Event>); | 
|  | 
| @@ -274,10 +274,6 @@ public: | 
| // and m_mediaController multipliers into account. | 
| double playerVolume() const; | 
|  | 
| -#if ENABLE(OILPAN) | 
| -    bool isFinalizing() const { return m_isFinalizing; } | 
| -#endif | 
| - | 
| protected: | 
| HTMLMediaElement(const QualifiedName&, Document&); | 
| virtual ~HTMLMediaElement(); | 
| @@ -293,7 +289,7 @@ protected: | 
| DisplayMode displayMode() const { return m_displayMode; } | 
| virtual void setDisplayMode(DisplayMode mode) { m_displayMode = mode; } | 
|  | 
| -    void setControllerInternal(PassRefPtr<MediaController>); | 
| +    void setControllerInternal(PassRefPtrWillBeRawPtr<MediaController>); | 
|  | 
| bool ignoreTrackDisplayUpdateRequests() const { return m_ignoreTrackDisplayUpdate > 0; } | 
| void beginIgnoringTrackDisplayUpdateRequests(); | 
| @@ -459,7 +455,7 @@ private: | 
| RefPtrWillBeMember<HTMLSourceElement> m_currentSourceNode; | 
| RefPtrWillBeMember<Node> m_nextChildNodeToConsider; | 
|  | 
| -    OwnPtr<MediaPlayer> m_player; | 
| +    OwnPtrWillBeMember<MediaPlayer> m_player; | 
| blink::WebLayer* m_webLayer; | 
|  | 
| MediaPlayer::Preload m_preload; | 
| @@ -506,9 +502,6 @@ private: | 
| bool m_tracksAreReady : 1; | 
| bool m_haveVisibleTextTrack : 1; | 
| bool m_processingPreferenceChange : 1; | 
| -#if ENABLE(OILPAN) | 
| -    bool m_isFinalizing : 1; | 
| -#endif | 
| double m_lastTextTrackUpdateTime; | 
|  | 
| RefPtrWillBeMember<TextTrackList> m_textTracks; | 
| @@ -525,7 +518,7 @@ private: | 
| #endif | 
|  | 
| friend class MediaController; | 
| -    RefPtr<MediaController> m_mediaController; | 
| +    RefPtrWillBeMember<MediaController> m_mediaController; | 
|  | 
| friend class Internals; | 
| friend class TrackDisplayUpdateScope; | 
|  |