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

Side by Side Diff: Source/modules/mediasource/MediaSourceBase.cpp

Issue 208263004: Move TraceEvent.h from platform/ to wtf/ Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 23 matching lines...) Expand all
34 #include "bindings/v8/ExceptionMessages.h" 34 #include "bindings/v8/ExceptionMessages.h"
35 #include "bindings/v8/ExceptionState.h" 35 #include "bindings/v8/ExceptionState.h"
36 #include "bindings/v8/ExceptionStatePlaceholder.h" 36 #include "bindings/v8/ExceptionStatePlaceholder.h"
37 #include "core/dom/ExceptionCode.h" 37 #include "core/dom/ExceptionCode.h"
38 #include "core/events/Event.h" 38 #include "core/events/Event.h"
39 #include "core/events/GenericEventQueue.h" 39 #include "core/events/GenericEventQueue.h"
40 #include "core/html/HTMLMediaElement.h" 40 #include "core/html/HTMLMediaElement.h"
41 #include "core/html/TimeRanges.h" 41 #include "core/html/TimeRanges.h"
42 #include "modules/mediasource/MediaSourceRegistry.h" 42 #include "modules/mediasource/MediaSourceRegistry.h"
43 #include "platform/Logging.h" 43 #include "platform/Logging.h"
44 #include "platform/TraceEvent.h"
45 #include "public/platform/WebMediaSource.h" 44 #include "public/platform/WebMediaSource.h"
46 #include "public/platform/WebSourceBuffer.h" 45 #include "public/platform/WebSourceBuffer.h"
46 #include "wtf/TraceEvent.h"
47 #include "wtf/text/WTFString.h" 47 #include "wtf/text/WTFString.h"
48 48
49 using blink::WebMediaSource; 49 using blink::WebMediaSource;
50 using blink::WebSourceBuffer; 50 using blink::WebSourceBuffer;
51 51
52 namespace WebCore { 52 namespace WebCore {
53 53
54 namespace { 54 namespace {
55 55
56 static bool throwExceptionIfClosedOrUpdating(bool isOpen, bool isUpdating, Excep tionState& exceptionState) 56 static bool throwExceptionIfClosedOrUpdating(bool isOpen, bool isUpdating, Excep tionState& exceptionState)
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 { 348 {
349 return ActiveDOMObject::executionContext(); 349 return ActiveDOMObject::executionContext();
350 } 350 }
351 351
352 URLRegistry& MediaSourceBase::registry() const 352 URLRegistry& MediaSourceBase::registry() const
353 { 353 {
354 return MediaSourceRegistry::registry(); 354 return MediaSourceRegistry::registry();
355 } 355 }
356 356
357 } 357 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698