提交 c2f8ed76 编写于 作者: E Eric Seidel

Remove a couple more core/ header includes from v8_inspector

Removed all uses of Frame in InspectorTraceEvents
in the process, since none of them actually
needed a Frame (since each sky instance only
has one frame).

I've just been burning down the list of core
includes using:
grep "#include" sky/engine/v8_inspector/* -h | sort | uniq | sort | grep core

TBR=yurys@chromium.org
BUG=435243

Review URL: https://codereview.chromium.org/771323002
上级 41796985
......@@ -122,7 +122,7 @@ v8::Local<v8::Value> ScriptController::callFunction(ExecutionContext* context, v
v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(v8::Handle<v8::Context> context, const ScriptSourceCode& source)
{
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript", "data", InspectorEvaluateScriptEvent::data(m_frame, source.url().string(), source.startLine()));
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript", "data", InspectorEvaluateScriptEvent::data(source.url().string(), source.startLine()));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
v8::Local<v8::Value> result;
......
......@@ -417,13 +417,8 @@ void V8InjectedScriptHost::callFunctionMethodCustom(const v8::FunctionCallbackIn
void V8InjectedScriptHost::suppressWarningsAndCallFunctionMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
{
InjectedScriptHost* host = V8InjectedScriptHost::toNative(info.Holder());
ScriptDebugServer& debugServer = host->scriptDebugServer();
debugServer.muteWarningsAndDeprecations();
// In sky we no longer have a fancy console with which to supress messages.
callFunctionMethodCustom(info);
debugServer.unmuteWarningsAndDeprecations();
}
} // namespace blink
......@@ -2302,7 +2302,7 @@ void Document::finishedParsing()
if (RefPtr<LocalFrame> f = frame()) {
checkCompleted();
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "MarkDOMContent", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorMarkLoadEvent::data(f.get()));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "MarkDOMContent", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorMarkLoadEvent::data());
}
// Schedule dropping of the ElementDataCache. We keep it alive for a while after parsing finishes
......
......@@ -1017,4 +1017,23 @@ void FrameView::setLayoutSizeInternal(const IntSize& size)
contentsResized();
}
void FrameView::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& totalObjects, bool& isPartial)
{
RenderObject* root = layoutRoot();
isPartial = true;
if (!root) {
isPartial = false;
root = m_frame->contentRenderer();
}
needsLayoutObjects = 0;
totalObjects = 0;
for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
++totalObjects;
if (o->needsLayout())
++needsLayoutObjects;
}
}
} // namespace blink
......@@ -206,6 +206,9 @@ public:
bool paintsEntireContents() const { return false; }
bool clipsPaintInvalidations() const { return true; }
// For inspector reporting:
void countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& totalObjects, bool& isPartial);
protected:
bool isVerticalDocument() const;
bool isFlippedDocument() const;
......
......@@ -738,7 +738,7 @@ void LocalDOMWindow::dispatchLoadEvent()
RefPtr<Event> loadEvent(Event::create(EventTypeNames::load));
dispatchEvent(loadEvent, document());
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "MarkLoad", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorMarkLoadEvent::data(frame()));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "MarkLoad", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorMarkLoadEvent::data());
}
bool LocalDOMWindow::dispatchEvent(PassRefPtr<Event> prpEvent, PassRefPtr<EventTarget> prpTarget)
......
......@@ -302,26 +302,6 @@ void LocalFrame::createView(const IntSize& viewportSize, const Color& background
frameView->updateBackgroundRecursively(backgroundColor, transparent);
}
void LocalFrame::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& totalObjects, bool& isPartial)
{
RenderObject* root = view()->layoutRoot();
isPartial = true;
if (!root) {
isPartial = false;
root = contentRenderer();
}
needsLayoutObjects = 0;
totalObjects = 0;
for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
++totalObjects;
if (o->needsLayout())
++needsLayoutObjects;
}
}
void LocalFrame::deviceOrPageScaleFactorChanged()
{
document()->mediaQueryAffectingValueChanged();
......
......@@ -103,8 +103,6 @@ namespace blink {
// ======== All public functions below this point are candidates to move out of LocalFrame into another class. ========
void countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& totalObjects, bool& isPartial);
FloatSize resizePageRectsKeepingRatio(const FloatSize& originalSize, const FloatSize& expectedSize);
void deviceOrPageScaleFactorChanged();
......
......@@ -5,25 +5,23 @@
#include "sky/engine/config.h"
#include "sky/engine/core/inspector/InspectorTraceEvents.h"
#include <inttypes.h>
#include "sky/engine/bindings/core/v8/ScriptCallStackFactory.h"
#include "sky/engine/bindings/core/v8/ScriptGCEvent.h"
#include "sky/engine/bindings/core/v8/ScriptSourceCode.h"
#include "sky/engine/core/events/Event.h"
#include "sky/engine/core/frame/FrameView.h"
#include "sky/engine/core/frame/LocalDOMWindow.h"
#include "sky/engine/core/frame/LocalFrame.h"
#include "sky/engine/core/inspector/IdentifiersFactory.h"
#include "sky/engine/core/inspector/InspectorNodeIds.h"
#include "sky/engine/core/inspector/ScriptCallStack.h"
#include "sky/engine/core/page/Page.h"
#include "sky/engine/core/rendering/RenderImage.h"
#include "sky/engine/core/rendering/RenderObject.h"
#include "sky/engine/platform/JSONValues.h"
#include "sky/engine/platform/TracedValue.h"
#include "sky/engine/platform/network/ResourceRequest.h"
#include "sky/engine/platform/network/ResourceResponse.h"
#include "sky/engine/platform/TracedValue.h"
#include "sky/engine/platform/weborigin/KURL.h"
#include "sky/engine/core/inspector/ScriptCallStack.h"
#include "sky/engine/wtf/Vector.h"
namespace blink {
......@@ -45,11 +43,6 @@ private:
String m_serialized;
};
String toHexString(void* p)
{
return String::format("0x%" PRIx64, static_cast<uint64>(reinterpret_cast<intptr_t>(p)));
}
}
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorLayoutEvent::beginData(FrameView* frameView)
......@@ -57,14 +50,12 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorLayoutEvent::beginData
bool isPartial;
unsigned needsLayoutObjects;
unsigned totalObjects;
LocalFrame& frame = frameView->frame();
frame.countObjectsNeedingLayout(needsLayoutObjects, totalObjects, isPartial);
frameView->countObjectsNeedingLayout(needsLayoutObjects, totalObjects, isPartial);
RefPtr<TracedValue> value = TracedValue::create();
value->setInteger("dirtyObjects", needsLayoutObjects);
value->setInteger("totalObjects", totalObjects);
value->setBoolean("partialLayout", isPartial);
value->setString("frame", toHexString(&frame));
return value;
}
......@@ -107,37 +98,34 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorLayoutEvent::endData(R
return value;
}
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorSendRequestEvent::data(unsigned long identifier, LocalFrame* frame, const ResourceRequest& request)
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorSendRequestEvent::data(unsigned long identifier, const ResourceRequest& request)
{
String requestId = IdentifiersFactory::requestId(identifier);
RefPtr<TracedValue> value = TracedValue::create();
value->setString("requestId", requestId);
value->setString("frame", toHexString(frame));
value->setString("url", request.url().string());
value->setString("requestMethod", request.httpMethod());
return value;
}
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorReceiveResponseEvent::data(unsigned long identifier, LocalFrame* frame, const ResourceResponse& response)
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorReceiveResponseEvent::data(unsigned long identifier, const ResourceResponse& response)
{
String requestId = IdentifiersFactory::requestId(identifier);
RefPtr<TracedValue> value = TracedValue::create();
value->setString("requestId", requestId);
value->setString("frame", toHexString(frame));
value->setInteger("statusCode", response.httpStatusCode());
value->setString("mimeType", response.mimeType().string().isolatedCopy());
return value;
}
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorReceiveDataEvent::data(unsigned long identifier, LocalFrame* frame, int encodedDataLength)
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorReceiveDataEvent::data(unsigned long identifier, int encodedDataLength)
{
String requestId = IdentifiersFactory::requestId(identifier);
RefPtr<TracedValue> value = TracedValue::create();
value->setString("requestId", requestId);
value->setString("frame", toHexString(frame));
value->setInteger("encodedDataLength", encodedDataLength);
return value;
}
......@@ -154,20 +142,10 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorResourceFinishEvent::d
return value;
}
static LocalFrame* frameForExecutionContext(ExecutionContext* context)
{
LocalFrame* frame = 0;
if (context->isDocument())
frame = context->executingWindow()->frame();
return frame;
}
static PassRefPtr<TracedValue> genericTimerData(ExecutionContext* context, int timerId)
{
RefPtr<TracedValue> value = TracedValue::create();
value->setInteger("timerId", timerId);
if (LocalFrame* frame = frameForExecutionContext(context))
value->setString("frame", toHexString(frame));
return value.release();
}
......@@ -193,7 +171,6 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationFrameEvent::d
{
RefPtr<TracedValue> value = TracedValue::create();
value->setInteger("id", callbackId);
value->setString("frame", toHexString(document->frame()));
return value;
}
......@@ -201,7 +178,6 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorParseHtmlEvent::beginD
{
RefPtr<TracedValue> value = TracedValue::create();
value->setInteger("startLine", startLine);
value->setString("frame", toHexString(document->frame()));
return value;
}
......@@ -217,7 +193,6 @@ static void localToPageQuad(const RenderObject& renderer, const LayoutRect& rect
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorPaintEvent::data(RenderObject* renderer, const LayoutRect& clipRect)
{
RefPtr<TracedValue> value = TracedValue::create();
value->setString("frame", toHexString(renderer->frame()));
FloatQuad quad;
localToPageQuad(*renderer, clipRect, &quad);
createQuad(value.get(), "clip", quad);
......@@ -226,25 +201,21 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorPaintEvent::data(Rende
return value;
}
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorMarkLoadEvent::data(LocalFrame* frame)
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorMarkLoadEvent::data()
{
RefPtr<TracedValue> value = TracedValue::create();
value->setString("frame", toHexString(frame));
return value;
return TracedValue::create();
}
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorScrollLayerEvent::data(RenderObject* renderer)
{
RefPtr<TracedValue> value = TracedValue::create();
value->setString("frame", toHexString(renderer->frame()));
setGeneratingNodeId(value.get(), "nodeId", renderer);
return value;
}
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorEvaluateScriptEvent::data(LocalFrame* frame, const String& url, int lineNumber)
PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorEvaluateScriptEvent::data(const String& url, int lineNumber)
{
RefPtr<TracedValue> value = TracedValue::create();
value->setString("frame", toHexString(frame));
value->setString("url", url);
value->setInteger("lineNumber", lineNumber);
return value;
......@@ -256,8 +227,6 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorFunctionCallEvent::dat
value->setString("scriptId", String::number(scriptId));
value->setString("scriptName", scriptName);
value->setInteger("scriptLine", scriptLine);
if (LocalFrame* frame = frameForExecutionContext(context))
value->setString("frame", toHexString(frame));
return value;
}
......@@ -305,8 +274,6 @@ PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorTimeStampEvent::data(E
{
RefPtr<TracedValue> value = TracedValue::create();
value->setString("message", message);
if (LocalFrame* frame = frameForExecutionContext(context))
value->setString("frame", toHexString(frame));
return value;
}
......
......@@ -18,7 +18,6 @@ class FrameView;
class GraphicsContext;
class KURL;
class LayoutRect;
class LocalFrame;
class RenderObject;
class RenderImage;
class ResourceRequest;
......@@ -34,17 +33,17 @@ public:
class InspectorSendRequestEvent {
public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceRequest&);
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, const ResourceRequest&);
};
class InspectorReceiveResponseEvent {
public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, const ResourceResponse&);
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, const ResourceResponse&);
};
class InspectorReceiveDataEvent {
public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, LocalFrame*, int encodedDataLength);
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(unsigned long identifier, int encodedDataLength);
};
class InspectorResourceFinishEvent {
......@@ -89,7 +88,7 @@ public:
class InspectorMarkLoadEvent {
public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*);
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data();
};
class InspectorScrollLayerEvent {
......@@ -99,7 +98,7 @@ public:
class InspectorEvaluateScriptEvent {
public:
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(LocalFrame*, const String& url, int lineNumber);
static PassRefPtr<TraceEvent::ConvertableToTraceFormat> data(const String& url, int lineNumber);
};
class InspectorFunctionCallEvent {
......
......@@ -68,7 +68,7 @@ void FrameFetchContext::dispatchDidChangeResourcePriority(unsigned long identifi
void FrameFetchContext::dispatchWillSendRequest(Document* document, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& initiatorInfo)
{
m_frame->loaderClient()->dispatchWillSendRequest(document, identifier, request, redirectResponse);
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceSendRequest", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorSendRequestEvent::data(identifier, m_frame, request));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceSendRequest", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorSendRequestEvent::data(identifier, request));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
}
......@@ -80,18 +80,18 @@ void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(const ResourceReq
void FrameFetchContext::dispatchDidReceiveResponse(Document* document, unsigned long identifier, const ResourceResponse& r, ResourceLoader* resourceLoader)
{
m_frame->loaderClient()->dispatchDidReceiveResponse(document, identifier, r);
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceiveResponse", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveResponseEvent::data(identifier, m_frame, r));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceiveResponse", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveResponseEvent::data(identifier, r));
m_frame->console().reportResourceResponseReceived(document, identifier, r);
}
void FrameFetchContext::dispatchDidReceiveData(Document*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
{
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveDataEvent::data(identifier, m_frame, encodedDataLength));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveDataEvent::data(identifier, encodedDataLength));
}
void FrameFetchContext::dispatchDidDownloadData(Document*, unsigned long identifier, int dataLength, int encodedDataLength)
{
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveDataEvent::data(identifier, m_frame, encodedDataLength));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "ResourceReceivedData", TRACE_EVENT_SCOPE_PROCESS, "data", InspectorReceiveDataEvent::data(identifier, encodedDataLength));
}
void FrameFetchContext::dispatchDidFinishLoading(Document* document, unsigned long identifier, double finishTime, int64_t encodedDataLength)
......
......@@ -34,7 +34,6 @@
#include "sky/engine/bindings/core/v8/V8Binding.h"
#include "sky/engine/bindings/core/v8/V8RecursionScope.h"
#include "sky/engine/core/dom/ExecutionContext.h"
// #include "core/dom/ExecutionContextTask.h"
#include "sky/engine/core/events/Event.h"
#include "sky/engine/core/events/EventTarget.h"
#include "sky/engine/wtf/text/StringBuilder.h"
......
......@@ -31,9 +31,6 @@
#include "sky/engine/config.h"
#include "sky/engine/v8_inspector/PageDebuggerAgent.h"
#include "sky/engine/bindings/core/v8/DOMWrapperWorld.h"
#include "sky/engine/bindings/core/v8/ScriptController.h"
#include "sky/engine/bindings/core/v8/ScriptSourceCode.h"
#include "sky/engine/core/frame/FrameConsole.h"
#include "sky/engine/v8_inspector/inspector_host.h"
......
......@@ -184,7 +184,7 @@ void PageScriptDebugServer::runScript(ScriptState* scriptState, const String& sc
ExecutionContext* executionContext = scriptState->executionContext();
LocalFrame* frame = executionContext->executingWindow()->frame();
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript", "data", InspectorEvaluateScriptEvent::data(frame, sourceURL, TextPosition::minimumPosition().m_line.oneBasedInt()));
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "EvaluateScript", "data", InspectorEvaluateScriptEvent::data(sourceURL, TextPosition::minimumPosition().m_line.oneBasedInt()));
TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::currentCallStack());
RefPtr<LocalFrame> protect = frame;
......@@ -300,16 +300,4 @@ void PageScriptDebugServer::clearPreprocessor()
m_scriptPreprocessor.clear();
}
void PageScriptDebugServer::muteWarningsAndDeprecations()
{
FrameConsole::mute();
// Used to mute UseCounter too.
}
void PageScriptDebugServer::unmuteWarningsAndDeprecations()
{
FrameConsole::unmute();
// Used to unmute UseCounter too.
}
} // namespace blink
......@@ -84,9 +84,6 @@ public:
virtual String preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName) override;
virtual void clearPreprocessor() override;
virtual void muteWarningsAndDeprecations() override;
virtual void unmuteWarningsAndDeprecations() override;
private:
PageScriptDebugServer();
virtual ~PageScriptDebugServer();
......
......@@ -31,7 +31,7 @@
#include "sky/engine/config.h"
#include "sky/engine/v8_inspector/ScriptDebugServer.h"
#include "bindings/core/v8/V8JavaScriptCallFrame.h"
#include "gen/sky/bindings/core/v8/V8JavaScriptCallFrame.h"
#include "sky/engine/bindings/core/v8/ScopedPersistent.h"
#include "sky/engine/bindings/core/v8/ScriptCallStackFactory.h"
#include "sky/engine/bindings/core/v8/ScriptController.h"
......
......@@ -112,9 +112,6 @@ public:
virtual String preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName);
virtual void clearPreprocessor() { }
virtual void muteWarningsAndDeprecations() { }
virtual void unmuteWarningsAndDeprecations() { }
protected:
explicit ScriptDebugServer(v8::Isolate*);
virtual ~ScriptDebugServer();
......
......@@ -37,7 +37,6 @@
#include "sky/engine/bindings/core/v8/V8Binding.h"
#include "sky/engine/bindings/core/v8/V8ScriptRunner.h"
#include "sky/engine/core/frame/FrameConsole.h"
#include "sky/engine/core/frame/FrameHost.h"
#include "sky/engine/core/frame/LocalFrame.h"
#include "sky/engine/core/inspector/ConsoleMessage.h"
#include "sky/engine/wtf/TemporaryChange.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册