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

Side by Side Diff: Source/bindings/v8/ScriptController.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) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 #include "core/frame/Settings.h" 59 #include "core/frame/Settings.h"
60 #include "core/frame/csp/ContentSecurityPolicy.h" 60 #include "core/frame/csp/ContentSecurityPolicy.h"
61 #include "core/html/HTMLPlugInElement.h" 61 #include "core/html/HTMLPlugInElement.h"
62 #include "core/inspector/InspectorInstrumentation.h" 62 #include "core/inspector/InspectorInstrumentation.h"
63 #include "core/inspector/ScriptCallStack.h" 63 #include "core/inspector/ScriptCallStack.h"
64 #include "core/loader/DocumentLoader.h" 64 #include "core/loader/DocumentLoader.h"
65 #include "core/loader/FrameLoader.h" 65 #include "core/loader/FrameLoader.h"
66 #include "core/loader/FrameLoaderClient.h" 66 #include "core/loader/FrameLoaderClient.h"
67 #include "core/plugins/PluginView.h" 67 #include "core/plugins/PluginView.h"
68 #include "platform/NotImplemented.h" 68 #include "platform/NotImplemented.h"
69 #include "platform/TraceEvent.h"
70 #include "platform/UserGestureIndicator.h" 69 #include "platform/UserGestureIndicator.h"
71 #include "platform/Widget.h" 70 #include "platform/Widget.h"
72 #include "platform/weborigin/SecurityOrigin.h" 71 #include "platform/weborigin/SecurityOrigin.h"
73 #include "public/platform/Platform.h" 72 #include "public/platform/Platform.h"
74 #include "wtf/CurrentTime.h" 73 #include "wtf/CurrentTime.h"
75 #include "wtf/StdLibExtras.h" 74 #include "wtf/StdLibExtras.h"
76 #include "wtf/StringExtras.h" 75 #include "wtf/StringExtras.h"
76 #include "wtf/TraceEvent.h"
77 #include "wtf/text/CString.h" 77 #include "wtf/text/CString.h"
78 #include "wtf/text/StringBuilder.h" 78 #include "wtf/text/StringBuilder.h"
79 #include "wtf/text/TextPosition.h" 79 #include "wtf/text/TextPosition.h"
80 80
81 namespace WebCore { 81 namespace WebCore {
82 82
83 bool ScriptController::canAccessFromCurrentOrigin(LocalFrame *frame) 83 bool ScriptController::canAccessFromCurrentOrigin(LocalFrame *frame)
84 { 84 {
85 if (!frame) 85 if (!frame)
86 return false; 86 return false;
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 v8Results = evaluateHandleScope.Escape(resultArray); 640 v8Results = evaluateHandleScope.Escape(resultArray);
641 } 641 }
642 642
643 if (results && !v8Results.IsEmpty()) { 643 if (results && !v8Results.IsEmpty()) {
644 for (size_t i = 0; i < v8Results->Length(); ++i) 644 for (size_t i = 0; i < v8Results->Length(); ++i)
645 results->append(ScriptValue(v8Results->Get(i), m_isolate)); 645 results->append(ScriptValue(v8Results->Get(i), m_isolate));
646 } 646 }
647 } 647 }
648 648
649 } // namespace WebCore 649 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698