| Index: third_party/WebKit/Source/core/probe/CoreProbes.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp b/third_party/WebKit/Source/core/probe/CoreProbes.cpp
|
| similarity index 66%
|
| rename from third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
|
| rename to third_party/WebKit/Source/core/probe/CoreProbes.cpp
|
| index a04b05b64793f709434fdde6d92cddc01979af3e..115384164deb986591a5d3a03cd4c9ab01f3588f 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp
|
| +++ b/third_party/WebKit/Source/core/probe/CoreProbes.cpp
|
| @@ -1,36 +1,36 @@
|
| /*
|
| -* Copyright (C) 2011 Google Inc. All rights reserved.
|
| -*
|
| -* Redistribution and use in source and binary forms, with or without
|
| -* modification, are permitted provided that the following conditions are
|
| -* met:
|
| -*
|
| -* * Redistributions of source code must retain the above copyright
|
| -* notice, this list of conditions and the following disclaimer.
|
| -* * Redistributions in binary form must reproduce the above
|
| -* copyright notice, this list of conditions and the following disclaimer
|
| -* in the documentation and/or other materials provided with the
|
| -* distribution.
|
| -* * Neither the name of Google Inc. nor the names of its
|
| -* contributors may be used to endorse or promote products derived from
|
| -* this software without specific prior written permission.
|
| -*
|
| -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| -* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| -* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| -* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| -* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| -* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| -* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| -*/
|
| -
|
| -#include "core/inspector/InspectorInstrumentation.h"
|
| -
|
| -#include "core/InspectorInstrumentationAgents.h"
|
| + * Copyright (C) 2011 Google Inc. All rights reserved.
|
| + *
|
| + * Redistribution and use in source and binary forms, with or without
|
| + * modification, are permitted provided that the following conditions are
|
| + * met:
|
| + *
|
| + * * Redistributions of source code must retain the above copyright
|
| + * notice, this list of conditions and the following disclaimer.
|
| + * * Redistributions in binary form must reproduce the above
|
| + * copyright notice, this list of conditions and the following disclaimer
|
| + * in the documentation and/or other materials provided with the
|
| + * distribution.
|
| + * * Neither the name of Google Inc. nor the names of its
|
| + * contributors may be used to endorse or promote products derived from
|
| + * this software without specific prior written permission.
|
| + *
|
| + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + */
|
| +
|
| +#include "core/probe/CoreProbes.h"
|
| +
|
| +#include "core/CoreProbeSink.h"
|
| #include "core/events/Event.h"
|
| #include "core/events/EventTarget.h"
|
| #include "core/frame/FrameHost.h"
|
| @@ -51,26 +51,8 @@
|
| #include "platform/loader/fetch/FetchInitiatorInfo.h"
|
|
|
| namespace blink {
|
| -
|
| namespace probe {
|
|
|
| -double ProbeBase::captureStartTime() const {
|
| - if (!m_startTime)
|
| - m_startTime = monotonicallyIncreasingTime();
|
| - return m_startTime;
|
| -}
|
| -
|
| -double ProbeBase::captureEndTime() const {
|
| - if (!m_endTime)
|
| - m_endTime = monotonicallyIncreasingTime();
|
| - return m_endTime;
|
| -}
|
| -
|
| -double ProbeBase::duration() const {
|
| - DCHECK(m_startTime);
|
| - return captureEndTime() - m_startTime;
|
| -}
|
| -
|
| AsyncTask::AsyncTask(ExecutionContext* context,
|
| void* task,
|
| const char* step,
|
| @@ -158,8 +140,7 @@ void continueWithPolicyIgnore(LocalFrame* frame,
|
| didReceiveResourceResponseButCanceled(frame, loader, identifier, r, resource);
|
| }
|
|
|
| -InspectorInstrumentationAgents* instrumentingAgentsFor(
|
| - WorkerGlobalScope* workerGlobalScope) {
|
| +CoreProbeSink* toCoreProbeSink(WorkerGlobalScope* workerGlobalScope) {
|
| if (!workerGlobalScope)
|
| return nullptr;
|
| if (WorkerInspectorController* controller =
|
| @@ -168,16 +149,13 @@ InspectorInstrumentationAgents* instrumentingAgentsFor(
|
| return nullptr;
|
| }
|
|
|
| -InspectorInstrumentationAgents* instrumentingAgentsForNonDocumentContext(
|
| - ExecutionContext* context) {
|
| +CoreProbeSink* toCoreProbeSinkForNonDocumentContext(ExecutionContext* context) {
|
| if (context->isWorkerGlobalScope())
|
| - return instrumentingAgentsFor(toWorkerGlobalScope(context));
|
| + return toCoreProbeSink(toWorkerGlobalScope(context));
|
| if (context->isMainThreadWorkletGlobalScope())
|
| - return instrumentingAgentsFor(
|
| - toMainThreadWorkletGlobalScope(context)->frame());
|
| + return toCoreProbeSink(toMainThreadWorkletGlobalScope(context)->frame());
|
| return nullptr;
|
| }
|
|
|
| -} // namespace InspectorInstrumentation
|
| -
|
| +} // namespace probe
|
| } // namespace blink
|
|
|