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

Side by Side Diff: WebCore/html/HTMLMediaElement.h

Issue 3691003: Merge 69043 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 years, 2 months 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 | « WebCore/dom/Document.cpp ('k') | WebCore/html/HTMLMediaElement.cpp » ('j') | 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 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
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 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 336
337 DisplayMode m_displayMode; 337 DisplayMode m_displayMode;
338 338
339 // Counter incremented while processing a callback from the media player, so we can avoid 339 // Counter incremented while processing a callback from the media player, so we can avoid
340 // calling the media engine recursively. 340 // calling the media engine recursively.
341 int m_processingMediaPlayerCallback; 341 int m_processingMediaPlayerCallback;
342 342
343 bool m_playing : 1; 343 bool m_playing : 1;
344 bool m_isWaitingUntilMediaCanStart : 1; 344 bool m_isWaitingUntilMediaCanStart : 1;
345 bool m_shouldDelayLoadEvent : 1; 345 bool m_shouldDelayLoadEvent : 1;
346 bool m_isWaitingToDecrementLoadEventDelayCount : 1;
347 bool m_haveFiredLoadedData : 1; 346 bool m_haveFiredLoadedData : 1;
348 bool m_inActiveDocument : 1; 347 bool m_inActiveDocument : 1;
349 bool m_autoplaying : 1; 348 bool m_autoplaying : 1;
350 bool m_muted : 1; 349 bool m_muted : 1;
351 bool m_paused : 1; 350 bool m_paused : 1;
352 bool m_seeking : 1; 351 bool m_seeking : 1;
353 352
354 // data has not been loaded since sending a "stalled" event 353 // data has not been loaded since sending a "stalled" event
355 bool m_sentStalledEvent : 1; 354 bool m_sentStalledEvent : 1;
356 355
(...skipping 15 matching lines...) Expand all
372 371
373 bool m_dispatchingCanPlayEvent : 1; 372 bool m_dispatchingCanPlayEvent : 1;
374 bool m_loadInitiatedByUserGesture : 1; 373 bool m_loadInitiatedByUserGesture : 1;
375 bool m_completelyLoaded : 1; 374 bool m_completelyLoaded : 1;
376 }; 375 };
377 376
378 } //namespace 377 } //namespace
379 378
380 #endif 379 #endif
381 #endif 380 #endif
OLDNEW
« no previous file with comments | « WebCore/dom/Document.cpp ('k') | WebCore/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698