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

Side by Side Diff: sky/engine/web/Sky.cpp

Issue 689373003: Remove most of the media stack. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 | « sky/engine/web/BUILD.gn ('k') | sky/engine/web/WebMediaDevicesRequest.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 29 matching lines...) Expand all
40 #include "core/animation/AnimationClock.h" 40 #include "core/animation/AnimationClock.h"
41 #include "core/dom/Microtask.h" 41 #include "core/dom/Microtask.h"
42 #include "core/frame/Settings.h" 42 #include "core/frame/Settings.h"
43 #include "core/page/Page.h" 43 #include "core/page/Page.h"
44 #include "gin/public/v8_platform.h" 44 #include "gin/public/v8_platform.h"
45 #include "mojo/common/message_pump_mojo.h" 45 #include "mojo/common/message_pump_mojo.h"
46 #include "platform/LayoutTestSupport.h" 46 #include "platform/LayoutTestSupport.h"
47 #include "platform/Logging.h" 47 #include "platform/Logging.h"
48 #include "platform/RuntimeEnabledFeatures.h" 48 #include "platform/RuntimeEnabledFeatures.h"
49 #include "platform/graphics/ImageDecodingStore.h" 49 #include "platform/graphics/ImageDecodingStore.h"
50 #include "platform/graphics/media/MediaPlayer.h"
51 #include "public/platform/Platform.h" 50 #include "public/platform/Platform.h"
52 #include "web/WebMediaPlayerClientImpl.h"
53 #include "wtf/Assertions.h" 51 #include "wtf/Assertions.h"
54 #include "wtf/CryptographicallyRandomNumber.h" 52 #include "wtf/CryptographicallyRandomNumber.h"
55 #include "wtf/MainThread.h" 53 #include "wtf/MainThread.h"
56 #include "wtf/WTF.h" 54 #include "wtf/WTF.h"
57 #include "wtf/text/AtomicString.h" 55 #include "wtf/text/AtomicString.h"
58 #include "wtf/text/TextEncoding.h" 56 #include "wtf/text/TextEncoding.h"
59 #include <v8.h> 57 #include <v8.h>
60 58
61 namespace blink { 59 namespace blink {
62 60
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 initializer.init(); 163 initializer.init();
166 164
167 // There are some code paths (for example, running WebKit in the browser 165 // There are some code paths (for example, running WebKit in the browser
168 // process and calling into LocalStorage before anything else) where the 166 // process and calling into LocalStorage before anything else) where the
169 // UTF8 string encoding tables are used on a background thread before 167 // UTF8 string encoding tables are used on a background thread before
170 // they're set up. This is a problem because their set up routines assert 168 // they're set up. This is a problem because their set up routines assert
171 // they're running on the main WebKitThread. It might be possible to make 169 // they're running on the main WebKitThread. It might be possible to make
172 // the initialization thread-safe, but given that so many code paths use 170 // the initialization thread-safe, but given that so many code paths use
173 // this, initializing this lazily probably doesn't buy us much. 171 // this, initializing this lazily probably doesn't buy us much.
174 WTF::UTF8Encoding(); 172 WTF::UTF8Encoding();
175
176 MediaPlayer::setMediaEngineCreateFunction(WebMediaPlayerClientImpl::create);
177 } 173 }
178 174
179 void shutdown() 175 void shutdown()
180 { 176 {
181 removeMessageLoopObservers(); 177 removeMessageLoopObservers();
182 178
183 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate(); 179 v8::Isolate* isolate = V8PerIsolateData::mainThreadIsolate();
184 V8PerIsolateData::dispose(isolate); 180 V8PerIsolateData::dispose(isolate);
185 181
186 shutdownWithoutV8(); 182 shutdownWithoutV8();
(...skipping 29 matching lines...) Expand all
216 void enableLogChannel(const char* name) 212 void enableLogChannel(const char* name)
217 { 213 {
218 #if !LOG_DISABLED 214 #if !LOG_DISABLED
219 WTFLogChannel* channel = getChannelFromName(name); 215 WTFLogChannel* channel = getChannelFromName(name);
220 if (channel) 216 if (channel)
221 channel->state = WTFLogChannelOn; 217 channel->state = WTFLogChannelOn;
222 #endif // !LOG_DISABLED 218 #endif // !LOG_DISABLED
223 } 219 }
224 220
225 } // namespace blink 221 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/web/BUILD.gn ('k') | sky/engine/web/WebMediaDevicesRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698