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

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

Issue 9937009: Merge 112623 - Crash in GenericEventQueue::~GenericEventQueue. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 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 | « Source/WebCore/dom/GenericEventQueue.cpp ('k') | Source/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, 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 494
495 #if PLATFORM(MAC) 495 #if PLATFORM(MAC)
496 void updateDisableSleep(); 496 void updateDisableSleep();
497 bool shouldDisableSleep() const; 497 bool shouldDisableSleep() const;
498 #endif 498 #endif
499 499
500 Timer<HTMLMediaElement> m_loadTimer; 500 Timer<HTMLMediaElement> m_loadTimer;
501 Timer<HTMLMediaElement> m_progressEventTimer; 501 Timer<HTMLMediaElement> m_progressEventTimer;
502 Timer<HTMLMediaElement> m_playbackProgressTimer; 502 Timer<HTMLMediaElement> m_playbackProgressTimer;
503 RefPtr<TimeRanges> m_playedTimeRanges; 503 RefPtr<TimeRanges> m_playedTimeRanges;
504 GenericEventQueue m_asyncEventQueue; 504 OwnPtr<GenericEventQueue> m_asyncEventQueue;
505 505
506 float m_playbackRate; 506 float m_playbackRate;
507 float m_defaultPlaybackRate; 507 float m_defaultPlaybackRate;
508 bool m_webkitPreservesPitch; 508 bool m_webkitPreservesPitch;
509 NetworkState m_networkState; 509 NetworkState m_networkState;
510 ReadyState m_readyState; 510 ReadyState m_readyState;
511 ReadyState m_readyStateMaximum; 511 ReadyState m_readyStateMaximum;
512 KURL m_currentSrc; 512 KURL m_currentSrc;
513 513
514 RefPtr<MediaError> m_error; 514 RefPtr<MediaError> m_error;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 return String::format("%p id=%s interval=%f-->%f cue=%s)", cue, cue->id( ).utf8().data(), cue->startTime(), cue->endTime(), cue->text().utf8().data()); 644 return String::format("%p id=%s interval=%f-->%f cue=%s)", cue, cue->id( ).utf8().data(), cue->startTime(), cue->endTime(), cue->text().utf8().data());
645 } 645 }
646 }; 646 };
647 #endif 647 #endif
648 #endif 648 #endif
649 649
650 } //namespace 650 } //namespace
651 651
652 #endif 652 #endif
653 #endif 653 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/dom/GenericEventQueue.cpp ('k') | Source/WebCore/html/HTMLMediaElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698