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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/WindowProxy.cpp

Issue 2391383002: Moving platform tracing things into platform/tracing. (Closed)
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009, 2011 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "core/html/HTMLIFrameElement.h" 50 #include "core/html/HTMLIFrameElement.h"
51 #include "core/inspector/InspectorInstrumentation.h" 51 #include "core/inspector/InspectorInstrumentation.h"
52 #include "core/inspector/MainThreadDebugger.h" 52 #include "core/inspector/MainThreadDebugger.h"
53 #include "core/loader/DocumentLoader.h" 53 #include "core/loader/DocumentLoader.h"
54 #include "core/loader/FrameLoader.h" 54 #include "core/loader/FrameLoader.h"
55 #include "core/loader/FrameLoaderClient.h" 55 #include "core/loader/FrameLoaderClient.h"
56 #include "core/origin_trials/OriginTrialContext.h" 56 #include "core/origin_trials/OriginTrialContext.h"
57 #include "platform/Histogram.h" 57 #include "platform/Histogram.h"
58 #include "platform/RuntimeEnabledFeatures.h" 58 #include "platform/RuntimeEnabledFeatures.h"
59 #include "platform/ScriptForbiddenScope.h" 59 #include "platform/ScriptForbiddenScope.h"
60 #include "platform/TraceEvent.h"
61 #include "platform/heap/Handle.h" 60 #include "platform/heap/Handle.h"
61 #include "platform/tracing/TraceEvent.h"
62 #include "platform/weborigin/SecurityOrigin.h" 62 #include "platform/weborigin/SecurityOrigin.h"
63 #include "public/platform/Platform.h" 63 #include "public/platform/Platform.h"
64 #include "wtf/Assertions.h" 64 #include "wtf/Assertions.h"
65 #include "wtf/StringExtras.h" 65 #include "wtf/StringExtras.h"
66 #include "wtf/text/CString.h" 66 #include "wtf/text/CString.h"
67 #include <algorithm> 67 #include <algorithm>
68 #include <utility> 68 #include <utility>
69 #include <v8-debug.h> 69 #include <v8-debug.h>
70 #include <v8.h> 70 #include <v8.h>
71 71
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 v8String(m_isolate, name)); 577 v8String(m_isolate, name));
578 } 578 }
579 579
580 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) { 580 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) {
581 if (!isContextInitialized()) 581 if (!isContextInitialized())
582 return; 582 return;
583 setSecurityToken(origin); 583 setSecurityToken(origin);
584 } 584 }
585 585
586 } // namespace blink 586 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp ('k') | third_party/WebKit/Source/core/animation/Animation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698