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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "platform/UserGestureIndicator.h" 75 #include "platform/UserGestureIndicator.h"
76 #include "platform/audio/AudioBus.h" 76 #include "platform/audio/AudioBus.h"
77 #include "platform/audio/AudioSourceProviderClient.h" 77 #include "platform/audio/AudioSourceProviderClient.h"
78 #include "platform/graphics/GraphicsLayer.h" 78 #include "platform/graphics/GraphicsLayer.h"
79 #include "platform/weborigin/SecurityOrigin.h" 79 #include "platform/weborigin/SecurityOrigin.h"
80 #include "public/platform/Platform.h" 80 #include "public/platform/Platform.h"
81 #include "public/platform/WebAudioSourceProvider.h" 81 #include "public/platform/WebAudioSourceProvider.h"
82 #include "public/platform/WebContentDecryptionModule.h" 82 #include "public/platform/WebContentDecryptionModule.h"
83 #include "public/platform/WebInbandTextTrack.h" 83 #include "public/platform/WebInbandTextTrack.h"
84 #include "wtf/CurrentTime.h" 84 #include "wtf/CurrentTime.h"
85 #include "wtf/MainThread.h"
86 #include "wtf/MathExtras.h" 85 #include "wtf/MathExtras.h"
87 #include "wtf/text/CString.h" 86 #include "wtf/text/CString.h"
88 #include <limits> 87 #include <limits>
89 88
90 #ifndef LOG_MEDIA_EVENTS 89 #ifndef LOG_MEDIA_EVENTS
91 // Default to not logging events because so many are generated they can overwhel m the rest of 90 // Default to not logging events because so many are generated they can overwhel m the rest of
92 // the logging. 91 // the logging.
93 #define LOG_MEDIA_EVENTS 0 92 #define LOG_MEDIA_EVENTS 0
94 #endif 93 #endif
95 94
(...skipping 3716 matching lines...) Expand 10 before | Expand all | Expand 10 after
3812 { 3811 {
3813 visitor->trace(m_client); 3812 visitor->trace(m_client);
3814 } 3813 }
3815 3814
3816 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl) 3815 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl)
3817 { 3816 {
3818 visitor->trace(m_client); 3817 visitor->trace(m_client);
3819 } 3818 }
3820 3819
3821 } // namespace blink 3820 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/History.cpp ('k') | third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698