Changeset 50013 in webkit
- Timestamp:
- Oct 23, 2009 5:24:49 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 added
- 11 edited
-
ChangeLog (modified) (1 diff)
-
GNUmakefile.am (modified) (2 diffs)
-
WebCore.gypi (modified) (2 diffs)
-
WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
-
WebCore.xcodeproj/project.pbxproj (modified) (12 diffs)
-
inspector/DOMDispatchTimelineItem.cpp (modified) (1 diff)
-
inspector/DOMDispatchTimelineItem.h (modified) (1 diff)
-
inspector/InspectorTimelineAgent.cpp (modified) (4 diffs)
-
inspector/InspectorTimelineAgent.h (modified) (2 diffs)
-
inspector/TimelineItem.cpp (modified) (1 diff)
-
inspector/TimelineItem.h (modified) (1 diff)
-
inspector/TimelineItemFactory.cpp (added)
-
inspector/TimelineItemFactory.h (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r50012 r50013 1 2009-10-23 Kelly Norton <knorton@google.com> 2 3 Reviewed by Pavel Feldman. 4 5 Removes the need for C++ Timeline types in InspectorTimelineAgent in favor 6 of ScriptObjects. 7 https://bugs.webkit.org/show_bug.cgi?id=30707 8 9 * GNUmakefile.am: 10 * WebCore.vcproj/WebCore.vcproj: 11 * WebCore.xcodeproj/project.pbxproj: 12 * inspector/DOMDispatchTimelineItem.cpp: Removed. 13 * inspector/DOMDispatchTimelineItem.h: Removed. 14 * inspector/InspectorTimelineAgent.cpp: 15 (WebCore::InspectorTimelineAgent::InspectorTimelineAgent): 16 (WebCore::InspectorTimelineAgent::willDispatchDOMEvent): 17 (WebCore::InspectorTimelineAgent::didDispatchDOMEvent): 18 (WebCore::InspectorTimelineAgent::willLayout): 19 (WebCore::InspectorTimelineAgent::didLayout): 20 (WebCore::InspectorTimelineAgent::willRecalculateStyle): 21 (WebCore::InspectorTimelineAgent::didRecalculateStyle): 22 (WebCore::InspectorTimelineAgent::willPaint): 23 (WebCore::InspectorTimelineAgent::didPaint): 24 (WebCore::InspectorTimelineAgent::willWriteHTML): 25 (WebCore::InspectorTimelineAgent::didWriteHTML): 26 (WebCore::InspectorTimelineAgent::reset): 27 (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord): 28 (WebCore::InspectorTimelineAgent::pushCurrentTimelineItem): 29 * inspector/InspectorTimelineAgent.h: 30 (WebCore::InspectorTimelineAgent::TimelineItemEntry::TimelineItemEntry): 31 * inspector/TimelineItem.cpp: Removed. 32 * inspector/TimelineItem.h: Removed. 33 * inspector/TimelineItemFactory.cpp: Added. 34 (WebCore::TimelineItemFactory::createGenericTimelineItem): 35 (WebCore::TimelineItemFactory::createDOMDispatchTimelineItem): 36 * inspector/TimelineItemFactory.h: Added. 37 (WebCore::): 38 (WebCore::TimelineItemFactory::TimelineItemFactory): 39 1 40 2009-10-23 Gavin Barraclough <barraclough@apple.com> 2 41 -
trunk/WebCore/GNUmakefile.am
r49998 r50013 1164 1164 WebCore/inspector/ConsoleMessage.cpp \ 1165 1165 WebCore/inspector/ConsoleMessage.h \ 1166 WebCore/inspector/DOMDispatchTimelineItem.cpp \1167 WebCore/inspector/DOMDispatchTimelineItem.h \1168 1166 WebCore/inspector/InspectorBackend.cpp \ 1169 1167 WebCore/inspector/InspectorBackend.h \ … … 1192 1190 WebCore/inspector/JavaScriptProfileNode.cpp \ 1193 1191 WebCore/inspector/JavaScriptProfileNode.h \ 1194 WebCore/inspector/TimelineItem .cpp \1195 WebCore/inspector/TimelineItem .h \1192 WebCore/inspector/TimelineItemFactory.cpp \ 1193 WebCore/inspector/TimelineItemFactory.h \ 1196 1194 WebCore/loader/Cache.cpp \ 1197 1195 WebCore/loader/Cache.h \ -
trunk/WebCore/WebCore.gypi
r49998 r50013 1511 1511 'inspector/ConsoleMessage.cpp', 1512 1512 'inspector/ConsoleMessage.h', 1513 'inspector/DOMDispatchTimelineItem.cpp',1514 'inspector/DOMDispatchTimelineItem.h',1515 1513 'inspector/InspectorBackend.cpp', 1516 1514 'inspector/InspectorBackend.h', … … 1538 1536 'inspector/JavaScriptProfileNode.cpp', 1539 1537 'inspector/JavaScriptProfileNode.h', 1540 'inspector/TimelineItem .cpp',1541 'inspector/TimelineItem .h',1538 'inspector/TimelineItemFactory.cpp', 1539 'inspector/TimelineItemFactory.h', 1542 1540 'loader/appcache/ApplicationCache.cpp', 1543 1541 'loader/appcache/ApplicationCache.h', -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r49998 r50013 36104 36104 </File> 36105 36105 <File 36106 RelativePath="..\inspector\DOMDispatchTimelineItem.cpp"36107 >36108 </File>36109 <File36110 RelativePath="..\inspector\DOMDispatchTimelineItem.h"36111 >36112 </File>36113 <File36114 36106 RelativePath="..\inspector\InspectorBackend.cpp" 36115 36107 > … … 36216 36208 </File> 36217 36209 <File 36218 RelativePath="..\inspector\TimelineItem .cpp"36219 > 36220 </File> 36221 <File 36222 RelativePath="..\inspector\TimelineItem .h"36210 RelativePath="..\inspector\TimelineItemFactory.cpp" 36211 > 36212 </File> 36213 <File 36214 RelativePath="..\inspector\TimelineItemFactory.h" 36223 36215 > 36224 36216 </File> -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r49998 r50013 1192 1192 65FEA86909833ADE00BED4AB /* Page.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65FEA86809833ADE00BED4AB /* Page.cpp */; }; 1193 1193 72626E020EF022FE00A07E20 /* FontFastPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72626E010EF022FE00A07E20 /* FontFastPath.cpp */; }; 1194 75092BFE104B80F9003DD168 /* DOMDispatchTimelineItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75092BFC104B80F9003DD168 /* DOMDispatchTimelineItem.cpp */; };1195 75092BFF104B80F9003DD168 /* DOMDispatchTimelineItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 75092BFD104B80F9003DD168 /* DOMDispatchTimelineItem.h */; };1196 1194 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */; }; 1197 1195 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */; }; 1196 7553CFE8108F473F00EA281E /* TimelineItemFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 7553CFE6108F473F00EA281E /* TimelineItemFactory.h */; }; 1197 7553CFE9108F473F00EA281E /* TimelineItemFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7553CFE7108F473F00EA281E /* TimelineItemFactory.cpp */; }; 1198 1198 75793E830D0CE0B3007FC0AC /* MessageEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75793E800D0CE0B3007FC0AC /* MessageEvent.cpp */; }; 1199 1199 75793E840D0CE0B3007FC0AC /* MessageEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 75793E810D0CE0B3007FC0AC /* MessageEvent.h */; }; … … 1203 1203 75793ED40D0CE85B007FC0AC /* DOMMessageEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75793ED10D0CE85B007FC0AC /* DOMMessageEvent.mm */; }; 1204 1204 75793ED50D0CE85B007FC0AC /* DOMMessageEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75793ED20D0CE85B007FC0AC /* DOMMessageEventInternal.h */; }; 1205 75A94A03104B74FB0006673C /* TimelineItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75A94A01104B74FB0006673C /* TimelineItem.cpp */; };1206 75A94A04104B74FB0006673C /* TimelineItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A94A02104B74FB0006673C /* TimelineItem.h */; };1207 1205 7693BAD2106C2DCA007B0823 /* HaltablePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 7693BACE106C2DCA007B0823 /* HaltablePlugin.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1208 1206 7693BAD3106C2DCA007B0823 /* PluginHalter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */; }; … … 6484 6482 65FEA86809833ADE00BED4AB /* Page.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Page.cpp; sourceTree = "<group>"; }; 6485 6483 72626E010EF022FE00A07E20 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = "<group>"; }; 6486 75092BFC104B80F9003DD168 /* DOMDispatchTimelineItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMDispatchTimelineItem.cpp; sourceTree = "<group>"; };6487 75092BFD104B80F9003DD168 /* DOMDispatchTimelineItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDispatchTimelineItem.h; sourceTree = "<group>"; };6488 6484 754133A7102E00E800075D00 /* InspectorTimelineAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTimelineAgent.h; sourceTree = "<group>"; }; 6489 6485 754133A9102E00F400075D00 /* InspectorTimelineAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorTimelineAgent.cpp; sourceTree = "<group>"; }; 6486 7553CFE6108F473F00EA281E /* TimelineItemFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineItemFactory.h; sourceTree = "<group>"; }; 6487 7553CFE7108F473F00EA281E /* TimelineItemFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimelineItemFactory.cpp; sourceTree = "<group>"; }; 6490 6488 75793E800D0CE0B3007FC0AC /* MessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = MessageEvent.cpp; path = dom/MessageEvent.cpp; sourceTree = SOURCE_ROOT; }; 6491 6489 75793E810D0CE0B3007FC0AC /* MessageEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MessageEvent.h; path = dom/MessageEvent.h; sourceTree = SOURCE_ROOT; }; … … 6496 6494 75793ED10D0CE85B007FC0AC /* DOMMessageEvent.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMMessageEvent.mm; sourceTree = "<group>"; }; 6497 6495 75793ED20D0CE85B007FC0AC /* DOMMessageEventInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DOMMessageEventInternal.h; sourceTree = "<group>"; }; 6498 75A94A01104B74FB0006673C /* TimelineItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimelineItem.cpp; sourceTree = "<group>"; };6499 75A94A02104B74FB0006673C /* TimelineItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimelineItem.h; sourceTree = "<group>"; };6500 6496 7693BACE106C2DCA007B0823 /* HaltablePlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HaltablePlugin.h; sourceTree = "<group>"; }; 6501 6497 7693BACF106C2DCA007B0823 /* PluginHalter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginHalter.cpp; sourceTree = "<group>"; }; … … 10364 10360 41F0618D0F5F069800A07EAC /* ConsoleMessage.cpp */, 10365 10361 41F0618C0F5F069800A07EAC /* ConsoleMessage.h */, 10366 75092BFC104B80F9003DD168 /* DOMDispatchTimelineItem.cpp */,10367 75092BFD104B80F9003DD168 /* DOMDispatchTimelineItem.h */,10368 10362 7A74ECB8101839A500BF939E /* InspectorBackend.cpp */, 10369 10363 7A74ECB9101839A600BF939E /* InspectorBackend.h */, … … 10395 10389 1C81B9FB0E9733CB00266E07 /* JavaScriptProfileNode.h */, 10396 10390 BCC64F5F0DCFB84E0081EF3B /* localizedStrings.js */, 10397 75 A94A01104B74FB0006673C /* TimelineItem.cpp*/,10398 75 A94A02104B74FB0006673C /* TimelineItem.h*/,10391 7553CFE6108F473F00EA281E /* TimelineItemFactory.h */, 10392 7553CFE7108F473F00EA281E /* TimelineItemFactory.cpp */, 10399 10393 ); 10400 10394 path = inspector; … … 15972 15966 E10B9CCC0B747A44003ED890 /* DOMCustomXPathNSResolver.h in Headers */, 15973 15967 BC7DAAEF0FF9615D00CE0138 /* DOMDataGridDataSource.h in Headers */, 15974 75092BFF104B80F9003DD168 /* DOMDispatchTimelineItem.h in Headers */,15975 15968 85ACABB00A9CAF8000671E90 /* DOMDocument.h in Headers */, 15976 15969 85089CDB0A98C42800A275AA /* DOMDocumentFragment.h in Headers */, … … 17921 17914 E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */, 17922 17915 185BCF290F3279CE000EA262 /* ThreadTimers.h in Headers */, 17923 75A94A04104B74FB0006673C /* TimelineItem.h in Headers */,17924 17916 9305B24D098F1B6B00C28855 /* Timer.h in Headers */, 17925 17917 E44613B00CD6331000FADA75 /* TimeRanges.h in Headers */, … … 18074 18066 973E325710883B7C005BC493 /* ResourceLoadNotifier.h in Headers */, 18075 18067 84801955108BAFB300CB2B1F /* FEGaussianBlur.h in Headers */, 18068 7553CFE8108F473F00EA281E /* TimelineItemFactory.h in Headers */, 18076 18069 BC97E23A109144950010D361 /* HTMLAllCollection.h in Headers */, 18077 18070 BC97E413109154FA0010D361 /* JSHTMLAllCollection.h in Headers */, … … 18548 18541 E10B9CCD0B747A44003ED890 /* DOMCustomXPathNSResolver.mm in Sources */, 18549 18542 BC7DAAEE0FF9615D00CE0138 /* DOMDataGridDataSource.cpp in Sources */, 18550 75092BFE104B80F9003DD168 /* DOMDispatchTimelineItem.cpp in Sources */,18551 18543 85ACABB10A9CAF8000671E90 /* DOMDocument.mm in Sources */, 18552 18544 85089CDC0A98C42800A275AA /* DOMDocumentFragment.mm in Sources */, … … 20077 20069 E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */, 20078 20070 185BCF280F3279CE000EA262 /* ThreadTimers.cpp in Sources */, 20079 75A94A03104B74FB0006673C /* TimelineItem.cpp in Sources */,20080 20071 93309EA4099EB78C0056E581 /* Timer.cpp in Sources */, 20081 20072 E44613AF0CD6331000FADA75 /* TimeRanges.cpp in Sources */, … … 20209 20200 973E325610883B7C005BC493 /* ResourceLoadNotifier.cpp in Sources */, 20210 20201 84801954108BAFB300CB2B1F /* FEGaussianBlur.cpp in Sources */, 20202 7553CFE9108F473F00EA281E /* TimelineItemFactory.cpp in Sources */, 20211 20203 BC97E23B109144950010D361 /* HTMLAllCollection.cpp in Sources */, 20212 20204 BC97E412109154FA0010D361 /* JSHTMLAllCollection.cpp in Sources */, -
trunk/WebCore/inspector/DOMDispatchTimelineItem.cpp
r48430 r50013 1 /*2 * Copyright (C) 2009 Google Inc. All rights reserved.3 *4 * Redistribution and use in source and binary forms, with or without5 * modification, are permitted provided that the following conditions are6 * met:7 *8 * * Redistributions of source code must retain the above copyright9 * notice, this list of conditions and the following disclaimer.10 * * Redistributions in binary form must reproduce the above11 * copyright notice, this list of conditions and the following disclaimer12 * in the documentation and/or other materials provided with the13 * distribution.14 * * Neither the name of Google Inc. nor the names of its15 * contributors may be used to endorse or promote products derived from16 * this software without specific prior written permission.17 *18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.29 */30 31 #include "config.h"32 #include "DOMDispatchTimelineItem.h"33 34 #if ENABLE(INSPECTOR)35 36 #include "Event.h"37 #include "InspectorFrontend.h"38 39 namespace WebCore {40 41 DOMDispatchTimelineItem::DOMDispatchTimelineItem(PassOwnPtr<TimelineItem> previous, double startTime, const Event& event)42 : TimelineItem(previous, startTime, DOMDispatchTimelineItemType)43 , m_eventType(event.type().string())44 {45 }46 47 ScriptObject DOMDispatchTimelineItem::convertToScriptObject(InspectorFrontend* frontend)48 {49 ScriptObject selfObj = TimelineItem::convertToScriptObject(frontend);50 ScriptObject dataObj = frontend->newScriptObject();51 dataObj.set("type", m_eventType);52 selfObj.set("data", dataObj);53 return selfObj;54 }55 56 } // namespace WebCore57 58 #endif // ENABLE(INSPECTOR) -
trunk/WebCore/inspector/DOMDispatchTimelineItem.h
r48167 r50013 1 /*2 * Copyright (C) 2009 Google Inc. All rights reserved.3 *4 * Redistribution and use in source and binary forms, with or without5 * modification, are permitted provided that the following conditions are6 * met:7 *8 * * Redistributions of source code must retain the above copyright9 * notice, this list of conditions and the following disclaimer.10 * * Redistributions in binary form must reproduce the above11 * copyright notice, this list of conditions and the following disclaimer12 * in the documentation and/or other materials provided with the13 * distribution.14 * * Neither the name of Google Inc. nor the names of its15 * contributors may be used to endorse or promote products derived from16 * this software without specific prior written permission.17 *18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.29 */30 31 #ifndef DOMDispatchTimelineItem_h32 #define DOMDispatchTimelineItem_h33 34 #include "TimelineItem.h"35 #include "PlatformString.h"36 37 namespace WebCore {38 39 class Event;40 class InspectorFrontend;41 42 class DOMDispatchTimelineItem : public TimelineItem {43 public:44 DOMDispatchTimelineItem(PassOwnPtr<TimelineItem> previous, double startTime, const Event&);45 46 virtual ~DOMDispatchTimelineItem() { }47 48 protected:49 virtual ScriptObject convertToScriptObject(InspectorFrontend*);50 51 private:52 String m_eventType;53 };54 55 } // namespace WebCore56 57 #endif // !defined(DOMDispatchTimelineItem_h)58 -
trunk/WebCore/inspector/InspectorTimelineAgent.cpp
r49898 r50013 34 34 #if ENABLE(INSPECTOR) 35 35 36 #include "DOMDispatchTimelineItem.h"37 36 #include "Event.h" 38 37 #include "InspectorFrontend.h" 39 #include "TimelineItem .h"38 #include "TimelineItemFactory.h" 40 39 41 40 #include <wtf/CurrentTime.h> … … 45 44 InspectorTimelineAgent::InspectorTimelineAgent(InspectorFrontend* frontend) 46 45 : m_frontend(frontend) 47 , m_currentTimelineItem(0)48 46 { 49 47 ASSERT(m_frontend); … … 56 54 void InspectorTimelineAgent::willDispatchDOMEvent(const Event& event) 57 55 { 58 m_currentTimelineItem = new DOMDispatchTimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), event);56 pushCurrentTimelineItem(TimelineItemFactory::createDOMDispatchTimelineItem(m_frontend, currentTimeInMilliseconds(), event), DOMDispatchTimelineItemType); 59 57 } 60 58 61 59 void InspectorTimelineAgent::didDispatchDOMEvent() 62 60 { 63 ASSERT(m_currentTimelineItem->type() == DOMDispatchTimelineItemType); 64 didCompleteCurrentRecord(); 61 didCompleteCurrentRecord(DOMDispatchTimelineItemType); 65 62 } 66 63 67 64 void InspectorTimelineAgent::willLayout() 68 65 { 69 m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), LayoutTimelineItemType);66 pushCurrentTimelineItem(TimelineItemFactory::createGenericTimelineItem(m_frontend, currentTimeInMilliseconds()), LayoutTimelineItemType); 70 67 } 71 68 72 69 void InspectorTimelineAgent::didLayout() 73 70 { 74 ASSERT(m_currentTimelineItem->type() == LayoutTimelineItemType); 75 didCompleteCurrentRecord(); 71 didCompleteCurrentRecord(LayoutTimelineItemType); 76 72 } 77 73 78 74 void InspectorTimelineAgent::willRecalculateStyle() 79 75 { 80 m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), RecalculateStylesTimelineItemType);76 pushCurrentTimelineItem(TimelineItemFactory::createGenericTimelineItem(m_frontend, currentTimeInMilliseconds()), RecalculateStylesTimelineItemType); 81 77 } 82 78 83 79 void InspectorTimelineAgent::didRecalculateStyle() 84 80 { 85 ASSERT(m_currentTimelineItem->type() == RecalculateStylesTimelineItemType); 86 didCompleteCurrentRecord(); 81 didCompleteCurrentRecord(RecalculateStylesTimelineItemType); 87 82 } 88 83 89 84 void InspectorTimelineAgent::willPaint() 90 85 { 91 m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), PaintTimelineItemType);86 pushCurrentTimelineItem(TimelineItemFactory::createGenericTimelineItem(m_frontend, currentTimeInMilliseconds()), PaintTimelineItemType); 92 87 } 93 88 94 89 void InspectorTimelineAgent::didPaint() 95 90 { 96 ASSERT(m_currentTimelineItem->type() == PaintTimelineItemType); 97 didCompleteCurrentRecord(); 91 didCompleteCurrentRecord(PaintTimelineItemType); 98 92 } 99 93 100 94 void InspectorTimelineAgent::willWriteHTML() 101 95 { 102 m_currentTimelineItem = new TimelineItem(m_currentTimelineItem.release(), currentTimeInMilliseconds(), ParseHTMLTimelineItemType);96 pushCurrentTimelineItem(TimelineItemFactory::createGenericTimelineItem(m_frontend, currentTimeInMilliseconds()), ParseHTMLTimelineItemType); 103 97 } 104 98 105 99 void InspectorTimelineAgent::didWriteHTML() 106 100 { 107 ASSERT(m_currentTimelineItem->type() == ParseHTMLTimelineItemType); 108 didCompleteCurrentRecord(); 101 didCompleteCurrentRecord(ParseHTMLTimelineItemType); 109 102 } 110 103 111 104 void InspectorTimelineAgent::reset() 112 105 { 113 m_ currentTimelineItem.set(0);106 m_itemStack.clear(); 114 107 } 115 108 116 void InspectorTimelineAgent::didCompleteCurrentRecord( )109 void InspectorTimelineAgent::didCompleteCurrentRecord(TimelineItemType type) 117 110 { 118 OwnPtr<TimelineItem> item(m_currentTimelineItem.release()); 119 m_currentTimelineItem = item->releasePrevious(); 120 121 item->setEndTime(currentTimeInMilliseconds()); 122 if (m_currentTimelineItem.get()) 123 m_currentTimelineItem->addChildItem(item.release()); 124 else 125 item->addToTimeline(m_frontend); 111 TimelineItemEntry entry = m_itemStack.last(); 112 m_itemStack.removeLast(); 113 ASSERT(entry.type == type); 114 entry.item.set("type", type); 115 entry.item.set("children", entry.children); 116 entry.item.set("endTime", currentTimeInMilliseconds()); 117 118 if (m_itemStack.isEmpty()) { 119 m_frontend->addItemToTimeline(entry.item); 120 } else { 121 TimelineItemEntry parent = m_itemStack.last(); 122 parent.children.set(parent.children.length(), entry.item); 123 } 126 124 } 127 125 … … 131 129 } 132 130 131 void InspectorTimelineAgent::pushCurrentTimelineItem(ScriptObject item, TimelineItemType type) 132 { 133 m_itemStack.append(TimelineItemEntry(item, m_frontend->newScriptArray(), type)); 134 } 135 133 136 } // namespace WebCore 134 137 -
trunk/WebCore/inspector/InspectorTimelineAgent.h
r49898 r50013 35 35 #include "ScriptArray.h" 36 36 37 #include <wtf/OwnPtr.h> 38 #include <wtf/PassOwnPtr.h> 37 #include <wtf/Vector.h> 39 38 40 39 namespace WebCore { 41 40 class Event; 42 41 class InspectorFrontend; 43 class TimelineItem; 42 43 // Must be kept in sync with TimelineAgent.js 44 enum TimelineItemType { 45 DOMDispatchTimelineItemType = 0, 46 LayoutTimelineItemType = 1, 47 RecalculateStylesTimelineItemType = 2, 48 PaintTimelineItemType = 3, 49 ParseHTMLTimelineItemType = 4, 50 }; 44 51 45 52 class InspectorTimelineAgent { … … 61 68 void didWriteHTML(); 62 69 void willWriteHTML(); 70 63 71 private: 72 struct TimelineItemEntry { 73 TimelineItemEntry(ScriptObject item, ScriptArray children, TimelineItemType type) : item(item), children(children), type(type) { } 74 ScriptObject item; 75 ScriptArray children; 76 TimelineItemType type; 77 }; 78 79 void pushCurrentTimelineItem(ScriptObject, TimelineItemType); 80 64 81 static double currentTimeInMilliseconds(); 65 82 66 void didCompleteCurrentRecord( );67 83 void didCompleteCurrentRecord(TimelineItemType); 84 68 85 InspectorFrontend* m_frontend; 69 OwnPtr<TimelineItem> m_currentTimelineItem; 86 87 Vector< TimelineItemEntry > m_itemStack; 70 88 }; 71 89 -
trunk/WebCore/inspector/TimelineItem.cpp
r48430 r50013 1 /*2 * Copyright (C) 2009 Google Inc. All rights reserved.3 *4 * Redistribution and use in source and binary forms, with or without5 * modification, are permitted provided that the following conditions are6 * met:7 *8 * * Redistributions of source code must retain the above copyright9 * notice, this list of conditions and the following disclaimer.10 * * Redistributions in binary form must reproduce the above11 * copyright notice, this list of conditions and the following disclaimer12 * in the documentation and/or other materials provided with the13 * distribution.14 * * Neither the name of Google Inc. nor the names of its15 * contributors may be used to endorse or promote products derived from16 * this software without specific prior written permission.17 *18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.29 */30 31 #include "config.h"32 #include "TimelineItem.h"33 34 #if ENABLE(INSPECTOR)35 36 #include "InspectorFrontend.h"37 #include "ScriptArray.h"38 #include "ScriptObject.h"39 40 namespace WebCore {41 42 TimelineItem::TimelineItem(PassOwnPtr<TimelineItem> previous, double startTime, TimelineItemType itemType)43 : m_startTime(startTime)44 , m_endTime(0.0)45 , m_itemType(itemType)46 , m_previous(previous)47 {48 }49 50 void TimelineItem::addToTimeline(InspectorFrontend* frontend)51 {52 frontend->addItemToTimeline(convertToScriptObject(frontend));53 }54 55 ScriptObject TimelineItem::convertToScriptObject(InspectorFrontend* frontend)56 {57 ScriptObject selfObj = frontend->newScriptObject();58 selfObj.set("time", m_startTime);59 selfObj.set("type", static_cast<int>(m_itemType));60 selfObj.set("duration", m_endTime - m_startTime);61 ScriptArray children = convertChildrenToScriptArray(frontend);62 selfObj.set("children", children);63 return selfObj;64 }65 66 ScriptArray TimelineItem::convertChildrenToScriptArray(InspectorFrontend* frontend)67 {68 ScriptArray children = frontend->newScriptArray();69 for (unsigned i = 0; i < m_children.size(); ++i)70 children.set(i, m_children[i]->convertToScriptObject(frontend));71 return children;72 }73 74 void TimelineItem::addChildItem(PassOwnPtr<TimelineItem> timelineItem)75 {76 m_children.append(timelineItem);77 }78 79 } // namespace WebCore80 81 #endif // ENABLE(INSPECTOR) -
trunk/WebCore/inspector/TimelineItem.h
r48167 r50013 1 /*2 * Copyright (C) 2009 Google Inc. All rights reserved.3 *4 * Redistribution and use in source and binary forms, with or without5 * modification, are permitted provided that the following conditions are6 * met:7 *8 * * Redistributions of source code must retain the above copyright9 * notice, this list of conditions and the following disclaimer.10 * * Redistributions in binary form must reproduce the above11 * copyright notice, this list of conditions and the following disclaimer12 * in the documentation and/or other materials provided with the13 * distribution.14 * * Neither the name of Google Inc. nor the names of its15 * contributors may be used to endorse or promote products derived from16 * this software without specific prior written permission.17 *18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.29 */30 31 #ifndef TimelineItem_h32 #define TimelineItem_h33 34 #include <wtf/OwnPtr.h>35 #include <wtf/PassOwnPtr.h>36 #include <wtf/Vector.h>37 38 namespace WebCore {39 40 class InspectorFrontend;41 class TimelineItem;42 class ScriptArray;43 class ScriptObject;44 45 typedef Vector<OwnPtr<TimelineItem> > TimelineItems;46 47 // Must be kept in sync with TimelineAgent.js48 enum TimelineItemType {49 DOMDispatchTimelineItemType = 0,50 LayoutTimelineItemType = 1,51 RecalculateStylesTimelineItemType = 2,52 PaintTimelineItemType = 3,53 ParseHTMLTimelineItemType = 4,54 };55 56 class TimelineItem {57 public:58 TimelineItem(PassOwnPtr<TimelineItem>, double startTime, TimelineItemType);59 60 virtual ~TimelineItem() { }61 62 TimelineItem* previous() const { return m_previous.get(); }63 64 PassOwnPtr<TimelineItem*> releasePrevious() { return m_previous.release(); }65 66 void addToTimeline(InspectorFrontend*);67 68 void addChildItem(PassOwnPtr<TimelineItem>);69 70 void setEndTime(double endTime) { m_endTime = endTime; }71 72 TimelineItemType type() { return m_itemType; }73 protected:74 virtual ScriptObject convertToScriptObject(InspectorFrontend*);75 76 ScriptArray convertChildrenToScriptArray(InspectorFrontend*);77 78 private:79 double m_startTime;80 double m_endTime;81 TimelineItemType m_itemType;82 OwnPtr<TimelineItem> m_previous;83 TimelineItems m_children;84 };85 86 } // namespace WebCore87 88 #endif // !defined(TimelineItem_h)
Note: See TracChangeset
for help on using the changeset viewer.
