OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #include "core/dom/NodeFilter.h" | 51 #include "core/dom/NodeFilter.h" |
52 #include "core/dom/QualifiedName.h" | 52 #include "core/dom/QualifiedName.h" |
53 #include "core/frame/LocalDOMWindow.h" | 53 #include "core/frame/LocalDOMWindow.h" |
54 #include "core/frame/LocalFrame.h" | 54 #include "core/frame/LocalFrame.h" |
55 #include "core/frame/Settings.h" | 55 #include "core/frame/Settings.h" |
56 #include "core/inspector/InspectorTraceEvents.h" | 56 #include "core/inspector/InspectorTraceEvents.h" |
57 #include "core/loader/FrameLoader.h" | 57 #include "core/loader/FrameLoader.h" |
58 #include "core/loader/FrameLoaderClient.h" | 58 #include "core/loader/FrameLoaderClient.h" |
59 #include "core/workers/WorkerGlobalScope.h" | 59 #include "core/workers/WorkerGlobalScope.h" |
60 #include "core/xml/XPathNSResolver.h" | 60 #include "core/xml/XPathNSResolver.h" |
61 #include "platform/EventTracer.h" | 61 #include "platform/JSONValues.h" |
| 62 #include "platform/TracedValue.h" |
62 #include "wtf/MainThread.h" | 63 #include "wtf/MainThread.h" |
63 #include "wtf/MathExtras.h" | 64 #include "wtf/MathExtras.h" |
64 #include "wtf/StdLibExtras.h" | 65 #include "wtf/StdLibExtras.h" |
65 #include "wtf/Threading.h" | 66 #include "wtf/Threading.h" |
66 #include "wtf/text/AtomicString.h" | 67 #include "wtf/text/AtomicString.h" |
67 #include "wtf/text/CString.h" | 68 #include "wtf/text/CString.h" |
68 #include "wtf/text/CharacterNames.h" | 69 #include "wtf/text/CharacterNames.h" |
69 #include "wtf/text/StringBuffer.h" | 70 #include "wtf/text/StringBuffer.h" |
70 #include "wtf/text/StringHash.h" | 71 #include "wtf/text/StringHash.h" |
71 #include "wtf/text/Unicode.h" | 72 #include "wtf/text/Unicode.h" |
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
941 ensureInitialized(); | 942 ensureInitialized(); |
942 return m_lineNumber; | 943 return m_lineNumber; |
943 } | 944 } |
944 | 945 |
945 String DevToolsFunctionInfo::resourceName() const | 946 String DevToolsFunctionInfo::resourceName() const |
946 { | 947 { |
947 ensureInitialized(); | 948 ensureInitialized(); |
948 return m_resourceName; | 949 return m_resourceName; |
949 } | 950 } |
950 | 951 |
951 PassRefPtr<TraceEvent::ConvertableToTraceFormat> devToolsTraceEventData(v8::Isol
ate* isolate, ExecutionContext* context, v8::Local<v8::Function> function) | 952 PassRefPtr<TracedValue> devToolsTraceEventData(v8::Isolate* isolate, ExecutionCo
ntext* context, v8::Local<v8::Function> function) |
952 { | 953 { |
953 DevToolsFunctionInfo info(function); | 954 DevToolsFunctionInfo info(function); |
954 return InspectorFunctionCallEvent::data(context, info.scriptId(), info.resou
rceName(), info.lineNumber()); | 955 return InspectorFunctionCallEvent::data(context, info.scriptId(), info.resou
rceName(), info.lineNumber()); |
955 } | 956 } |
956 | 957 |
957 void v8ConstructorAttributeGetter(v8::Local<v8::Name> propertyName, const v8::Pr
opertyCallbackInfo<v8::Value>& info) | 958 void v8ConstructorAttributeGetter(v8::Local<v8::Name> propertyName, const v8::Pr
opertyCallbackInfo<v8::Value>& info) |
958 { | 959 { |
959 TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMGetter"); | 960 TRACE_EVENT_SET_SAMPLING_STATE("blink", "DOMGetter"); |
960 v8::Local<v8::Value> data = info.Data(); | 961 v8::Local<v8::Value> data = info.Data(); |
961 ASSERT(data->IsExternal()); | 962 ASSERT(data->IsExternal()); |
962 V8PerContextData* perContextData = V8PerContextData::from(info.Holder()->Cre
ationContext()); | 963 V8PerContextData* perContextData = V8PerContextData::from(info.Holder()->Cre
ationContext()); |
963 if (!perContextData) | 964 if (!perContextData) |
964 return; | 965 return; |
965 v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::u
nwrap(data))); | 966 v8SetReturnValue(info, perContextData->constructorForType(WrapperTypeInfo::u
nwrap(data))); |
966 TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution"); | 967 TRACE_EVENT_SET_SAMPLING_STATE("v8", "V8Execution"); |
967 } | 968 } |
968 | 969 |
969 } // namespace blink | 970 } // namespace blink |
OLD | NEW |