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

Side by Side Diff: Source/core/inspector/InspectorTraceEvents.cpp

Issue 923953002: Move rendering/RenderImage* to layout/LayoutImage* (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.h ('k') | Source/core/layout/HitTestResult.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/inspector/InspectorTraceEvents.h" 6 #include "core/inspector/InspectorTraceEvents.h"
7 7
8 #include "bindings/core/v8/ScriptCallStackFactory.h" 8 #include "bindings/core/v8/ScriptCallStackFactory.h"
9 #include "bindings/core/v8/ScriptGCEvent.h" 9 #include "bindings/core/v8/ScriptGCEvent.h"
10 #include "bindings/core/v8/ScriptSourceCode.h" 10 #include "bindings/core/v8/ScriptSourceCode.h"
11 #include "core/animation/Animation.h" 11 #include "core/animation/Animation.h"
12 #include "core/animation/AnimationPlayer.h" 12 #include "core/animation/AnimationPlayer.h"
13 #include "core/css/invalidation/DescendantInvalidationSet.h" 13 #include "core/css/invalidation/DescendantInvalidationSet.h"
14 #include "core/dom/StyleChangeReason.h" 14 #include "core/dom/StyleChangeReason.h"
15 #include "core/events/Event.h" 15 #include "core/events/Event.h"
16 #include "core/fetch/CSSStyleSheetResource.h" 16 #include "core/fetch/CSSStyleSheetResource.h"
17 #include "core/frame/FrameView.h" 17 #include "core/frame/FrameView.h"
18 #include "core/frame/LocalFrame.h" 18 #include "core/frame/LocalFrame.h"
19 #include "core/inspector/IdentifiersFactory.h" 19 #include "core/inspector/IdentifiersFactory.h"
20 #include "core/inspector/InspectorNodeIds.h" 20 #include "core/inspector/InspectorNodeIds.h"
21 #include "core/inspector/ScriptCallStack.h" 21 #include "core/inspector/ScriptCallStack.h"
22 #include "core/layout/Layer.h" 22 #include "core/layout/Layer.h"
23 #include "core/layout/LayoutImage.h"
23 #include "core/layout/LayoutObject.h" 24 #include "core/layout/LayoutObject.h"
24 #include "core/page/Page.h" 25 #include "core/page/Page.h"
25 #include "core/rendering/RenderImage.h"
26 #include "core/workers/WorkerThread.h" 26 #include "core/workers/WorkerThread.h"
27 #include "core/xmlhttprequest/XMLHttpRequest.h" 27 #include "core/xmlhttprequest/XMLHttpRequest.h"
28 #include "platform/JSONValues.h" 28 #include "platform/JSONValues.h"
29 #include "platform/TracedValue.h" 29 #include "platform/TracedValue.h"
30 #include "platform/graphics/GraphicsLayer.h" 30 #include "platform/graphics/GraphicsLayer.h"
31 #include "platform/network/ResourceRequest.h" 31 #include "platform/network/ResourceRequest.h"
32 #include "platform/network/ResourceResponse.h" 32 #include "platform/network/ResourceResponse.h"
33 #include "platform/weborigin/KURL.h" 33 #include "platform/weborigin/KURL.h"
34 #include "wtf/Vector.h" 34 #include "wtf/Vector.h"
35 #include <inttypes.h> 35 #include <inttypes.h>
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 RefPtr<TracedValue> value = TracedValue::create(); 586 RefPtr<TracedValue> value = TracedValue::create();
587 value->setString("scriptId", String::number(scriptId)); 587 value->setString("scriptId", String::number(scriptId));
588 value->setString("scriptName", scriptName); 588 value->setString("scriptName", scriptName);
589 value->setInteger("scriptLine", scriptLine); 589 value->setInteger("scriptLine", scriptLine);
590 if (LocalFrame* frame = frameForExecutionContext(context)) 590 if (LocalFrame* frame = frameForExecutionContext(context))
591 value->setString("frame", toHexString(frame)); 591 value->setString("frame", toHexString(frame));
592 setCallStack(value.get()); 592 setCallStack(value.get());
593 return value.release(); 593 return value.release();
594 } 594 }
595 595
596 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorPaintImageEvent::data( const RenderImage& renderImage) 596 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorPaintImageEvent::data( const LayoutImage& layoutImage)
597 { 597 {
598 RefPtr<TracedValue> value = TracedValue::create(); 598 RefPtr<TracedValue> value = TracedValue::create();
599 setGeneratingNodeInfo(value.get(), &renderImage, "nodeId"); 599 setGeneratingNodeInfo(value.get(), &layoutImage, "nodeId");
600 if (const ImageResource* resource = renderImage.cachedImage()) 600 if (const ImageResource* resource = layoutImage.cachedImage())
601 value->setString("url", resource->url().string()); 601 value->setString("url", resource->url().string());
602 return value.release(); 602 return value.release();
603 } 603 }
604 604
605 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorPaintImageEvent::data( const LayoutObject& owningRenderer, const StyleImage& styleImage) 605 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorPaintImageEvent::data( const LayoutObject& owningRenderer, const StyleImage& styleImage)
606 { 606 {
607 RefPtr<TracedValue> value = TracedValue::create(); 607 RefPtr<TracedValue> value = TracedValue::create();
608 setGeneratingNodeInfo(value.get(), &owningRenderer, "nodeId"); 608 setGeneratingNodeInfo(value.get(), &owningRenderer, "nodeId");
609 if (const ImageResource* resource = styleImage.cachedImage()) 609 if (const ImageResource* resource = styleImage.cachedImage())
610 value->setString("url", resource->url().string()); 610 value->setString("url", resource->url().string());
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 } 712 }
713 713
714 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationStateEvent::d ata(const AnimationPlayer& player) 714 PassRefPtr<TraceEvent::ConvertableToTraceFormat> InspectorAnimationStateEvent::d ata(const AnimationPlayer& player)
715 { 715 {
716 RefPtr<TracedValue> value = TracedValue::create(); 716 RefPtr<TracedValue> value = TracedValue::create();
717 value->setString("state", player.playState()); 717 value->setString("state", player.playState());
718 return value.release(); 718 return value.release();
719 } 719 }
720 720
721 } 721 }
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorTraceEvents.h ('k') | Source/core/layout/HitTestResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698