Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: Source/WebCore/html/HTMLMediaElement.cpp

Issue 11368088: Merge 133262 - Build fix. http://trac.webkit.org/changeset/133252 broke the Windows build. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserv ed.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 3692 matching lines...) Expand 10 before | Expand all | Expand 10 after
3703 3703
3704 // Reset m_readyState since m_player is gone. 3704 // Reset m_readyState since m_player is gone.
3705 m_readyState = HAVE_NOTHING; 3705 m_readyState = HAVE_NOTHING;
3706 updateMediaController(); 3706 updateMediaController();
3707 #if ENABLE(VIDEO_TRACK) 3707 #if ENABLE(VIDEO_TRACK)
3708 if (RuntimeEnabledFeatures::webkitVideoTrackEnabled()) 3708 if (RuntimeEnabledFeatures::webkitVideoTrackEnabled())
3709 updateActiveTextTrackCues(0); 3709 updateActiveTextTrackCues(0);
3710 #endif 3710 #endif
3711 } 3711 }
3712 3712
3713 void HTMLMediaElement::clearMediaPlayer(unsigned flags) 3713 void HTMLMediaElement::clearMediaPlayer(signed flags)
3714 { 3714 {
3715 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO) 3715 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO)
3716 m_player.clear(); 3716 m_player.clear();
3717 #endif 3717 #endif
3718 stopPeriodicTimers(); 3718 stopPeriodicTimers();
3719 m_loadTimer.stop(); 3719 m_loadTimer.stop();
3720 3720
3721 m_pendingLoadFlags &= ~flags; 3721 m_pendingLoadFlags &= ~flags;
3722 m_loadState = WaitingForSource; 3722 m_loadState = WaitingForSource;
3723 } 3723 }
(...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after
4574 return mediaPlayerOwningDocument()->view()->windowClipRect(); 4574 return mediaPlayerOwningDocument()->view()->windowClipRect();
4575 } 4575 }
4576 4576
4577 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture() 4577 void HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture()
4578 { 4578 {
4579 m_restrictions = NoRestrictions; 4579 m_restrictions = NoRestrictions;
4580 } 4580 }
4581 4581
4582 } 4582 }
4583 #endif 4583 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698