<rdar://problem/5956403> Update the Develop menu to match the new Inspector items
authortimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 May 2008 18:37:59 +0000 (18:37 +0000)
committertimothy@apple.com <timothy@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 May 2008 18:37:59 +0000 (18:37 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@34027 268f45cc-cd09-0410-ab3c-d52691b4dbfc

18 files changed:
WebCore/ChangeLog
WebCore/English.lproj/localizedStrings.js
WebCore/WebCore.base.exp
WebCore/page/InspectorController.cpp
WebCore/page/InspectorController.h
WebCore/page/inspector/ProfilesPanel.js
WebCore/page/inspector/ScriptsPanel.js
WebCore/page/inspector/inspector.js
WebKit/ChangeLog
WebKit/English.lproj/Localizable.strings
WebKit/mac/ChangeLog
WebKit/mac/WebCoreSupport/WebInspectorClient.mm
WebKit/mac/WebInspector/WebInspector.h
WebKit/mac/WebInspector/WebInspector.mm
WebKit/win/ChangeLog
WebKit/win/English.lproj/Localizable.strings
WebKit/win/WebInspector.cpp
WebKit/win/WebInspector.h

index 76cba40..36d0f6c 100644 (file)
@@ -1,3 +1,27 @@
+2008-05-22  Timothy Hatcher  <timothy@apple.com>
+
+        <rdar://problem/5956403> Update the Develop menu to match the new Inspector items
+
+        Reviewed by Adam Roben.
+
+        * English.lproj/localizedStrings.js:
+        * WebCore.base.exp:
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::inspect):
+        (WebCore::InspectorController::setWindowVisible):
+        (WebCore::InspectorController::showPanel):
+        (WebCore::InspectorController::startUserInitiatedProfiling):
+        (WebCore::InspectorController::stopUserInitiatedProfiling):
+        (WebCore::InspectorController::startDebuggingAndReloadInspectedPage):
+        (WebCore::InspectorController::stopDebugging):
+        * page/InspectorController.h:
+        (WebCore::InspectorController::):
+        (WebCore::InspectorController::isRecordingUserInitiatedProfile):
+        * page/inspector/ProfilesPanel.js:
+        * page/inspector/ScriptsPanel.js:
+        * page/inspector/inspector.js:
+
 2008-05-22  Josh Aas  <joshmoz@gmail.com>
 
         Reviewed by Anders.
index d308338..29c3d30 100644 (file)
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
index 673b105..dec1646 100644 (file)
@@ -1,3 +1,126 @@
+.objc_class_name_DOMAbstractView
+.objc_class_name_DOMAttr
+.objc_class_name_DOMCDATASection
+.objc_class_name_DOMCSSCharsetRule
+.objc_class_name_DOMCSSFontFaceRule
+.objc_class_name_DOMCSSImportRule
+.objc_class_name_DOMCSSMediaRule
+.objc_class_name_DOMCSSPageRule
+.objc_class_name_DOMCSSPrimitiveValue
+.objc_class_name_DOMCSSRule
+.objc_class_name_DOMCSSRuleList
+.objc_class_name_DOMCSSStyleDeclaration
+.objc_class_name_DOMCSSStyleRule
+.objc_class_name_DOMCSSStyleSheet
+.objc_class_name_DOMCSSUnknownRule
+.objc_class_name_DOMCSSValue
+.objc_class_name_DOMCSSValueList
+.objc_class_name_DOMCharacterData
+.objc_class_name_DOMComment
+.objc_class_name_DOMCounter
+.objc_class_name_DOMDocument
+.objc_class_name_DOMDocumentFragment
+.objc_class_name_DOMDocumentType
+.objc_class_name_DOMElement
+.objc_class_name_DOMEntity
+.objc_class_name_DOMEntityReference
+.objc_class_name_DOMEvent
+.objc_class_name_DOMHTMLAnchorElement
+.objc_class_name_DOMHTMLAppletElement
+.objc_class_name_DOMHTMLAreaElement
+.objc_class_name_DOMHTMLBRElement
+.objc_class_name_DOMHTMLBaseElement
+.objc_class_name_DOMHTMLBaseFontElement
+.objc_class_name_DOMHTMLBodyElement
+.objc_class_name_DOMHTMLButtonElement
+.objc_class_name_DOMHTMLCollection
+.objc_class_name_DOMHTMLDListElement
+.objc_class_name_DOMHTMLDirectoryElement
+.objc_class_name_DOMHTMLDivElement
+.objc_class_name_DOMHTMLDocument
+.objc_class_name_DOMHTMLElement
+.objc_class_name_DOMHTMLEmbedElement
+.objc_class_name_DOMHTMLFieldSetElement
+.objc_class_name_DOMHTMLFontElement
+.objc_class_name_DOMHTMLFormElement
+.objc_class_name_DOMHTMLFrameElement
+.objc_class_name_DOMHTMLFrameSetElement
+.objc_class_name_DOMHTMLHRElement
+.objc_class_name_DOMHTMLHeadElement
+.objc_class_name_DOMHTMLHeadingElement
+.objc_class_name_DOMHTMLHtmlElement
+.objc_class_name_DOMHTMLIFrameElement
+.objc_class_name_DOMHTMLImageElement
+.objc_class_name_DOMHTMLInputElement
+.objc_class_name_DOMHTMLIsIndexElement
+.objc_class_name_DOMHTMLLIElement
+.objc_class_name_DOMHTMLLabelElement
+.objc_class_name_DOMHTMLLegendElement
+.objc_class_name_DOMHTMLLinkElement
+.objc_class_name_DOMHTMLMapElement
+.objc_class_name_DOMHTMLMenuElement
+.objc_class_name_DOMHTMLMetaElement
+.objc_class_name_DOMHTMLModElement
+.objc_class_name_DOMHTMLOListElement
+.objc_class_name_DOMHTMLObjectElement
+.objc_class_name_DOMHTMLOptGroupElement
+.objc_class_name_DOMHTMLOptionElement
+.objc_class_name_DOMHTMLOptionsCollection
+.objc_class_name_DOMHTMLParagraphElement
+.objc_class_name_DOMHTMLParamElement
+.objc_class_name_DOMHTMLPreElement
+.objc_class_name_DOMHTMLQuoteElement
+.objc_class_name_DOMHTMLScriptElement
+.objc_class_name_DOMHTMLSelectElement
+.objc_class_name_DOMHTMLStyleElement
+.objc_class_name_DOMHTMLTableCaptionElement
+.objc_class_name_DOMHTMLTableCellElement
+.objc_class_name_DOMHTMLTableColElement
+.objc_class_name_DOMHTMLTableElement
+.objc_class_name_DOMHTMLTableRowElement
+.objc_class_name_DOMHTMLTableSectionElement
+.objc_class_name_DOMHTMLTextAreaElement
+.objc_class_name_DOMHTMLTitleElement
+.objc_class_name_DOMHTMLUListElement
+.objc_class_name_DOMImplementation
+.objc_class_name_DOMKeyboardEvent
+.objc_class_name_DOMMediaList
+.objc_class_name_DOMMouseEvent
+.objc_class_name_DOMMutationEvent
+.objc_class_name_DOMNamedNodeMap
+.objc_class_name_DOMNode
+.objc_class_name_DOMNodeFilter
+.objc_class_name_DOMNodeIterator
+.objc_class_name_DOMNodeList
+.objc_class_name_DOMNotation
+.objc_class_name_DOMObject
+.objc_class_name_DOMProcessingInstruction
+.objc_class_name_DOMRGBColor
+.objc_class_name_DOMRange
+.objc_class_name_DOMRect
+.objc_class_name_DOMStyleSheet
+.objc_class_name_DOMStyleSheetList
+.objc_class_name_DOMText
+.objc_class_name_DOMTextEvent
+.objc_class_name_DOMTreeWalker
+.objc_class_name_DOMUIEvent
+.objc_class_name_DOMWheelEvent
+.objc_class_name_WebCoreKeyGenerator
+.objc_class_name_WebCoreViewFactory
+.objc_class_name_WebScriptObject
+.objc_class_name_WebScriptObjectPrivate
+.objc_class_name_WebUndefined
+_DOMEventException
+_DOMException
+_DOMRangeException
+_DOMXPathException
+_WebCoreDrawTextAtPoint
+_WebCoreFindFont
+_WebCoreObjCFinalizeOnMainThread
+_WebCoreSetAlwaysUseATSU
+_WebCoreSetShouldUseFontSmoothing
+_WebCoreShouldUseFontSmoothing
+_WebCoreTextFloatWidth
 __Z26ReportBlockedObjCExceptionP11NSException
 __ZN7WebCore10CachedPage14documentLoaderEv
 __ZN7WebCore10CachedPage22cachedPagePlatformDataEv
@@ -6,10 +129,9 @@ __ZN7WebCore10EventNames10clickEventE
 __ZN7WebCore10EventNames12keydownEventE
 __ZN7WebCore10MouseEventC1ERKNS_12AtomicStringEbbPNS_9DOMWindowEiiiiibbbbtPNS_15EventTargetNodeEPNS_9ClipboardEb
 __ZN7WebCore10StringImpl7replaceEtt
-__ZN7WebCore10StringImplcvP8NSStringEv
 __ZN7WebCore10StringImplD1Ev
+__ZN7WebCore10StringImplcvP8NSStringEv
 __ZN7WebCore11ContextMenu22setPlatformDescriptionEP14NSMutableArray
-__ZN7WebCore11currentTimeEv
 __ZN7WebCore11EditCommand7reapplyEv
 __ZN7WebCore11EditCommand7unapplyEv
 __ZN7WebCore11FileChooser10chooseFileERKNS_6StringE
@@ -52,7 +174,6 @@ __ZN7WebCore11FrameLoader5clearEbb
 __ZN7WebCore11FrameLoader6reloadEv
 __ZN7WebCore11FrameLoader7addDataEPKci
 __ZN7WebCore11FrameLoader7canLoadERKNS_4KURLEPKNS_8DocumentE
-__ZN7WebCore11globalPointERK8_NSPointP8NSWindow
 __ZN7WebCore11HistoryItem12addChildItemEN3WTF10PassRefPtrIS0_EE
 __ZN7WebCore11HistoryItem12setURLStringERKNS_6StringE
 __ZN7WebCore11HistoryItem12setViewStateEP11objc_object
@@ -72,8 +193,8 @@ __ZN7WebCore11HistoryItem8setTitleERKNS_6StringE
 __ZN7WebCore11HistoryItem9setParentERKNS_6StringE
 __ZN7WebCore11HistoryItem9setTargetERKNS_6StringE
 __ZN7WebCore11HistoryItemC1ERKNS_4KURLERKNS_6StringES6_S6_
-__ZN7WebCore11HistoryItemC1ERKNS_6StringES3_d
 __ZN7WebCore11HistoryItemC1ERKNS_6StringES3_S3_d
+__ZN7WebCore11HistoryItemC1ERKNS_6StringES3_d
 __ZN7WebCore11HistoryItemC1Ev
 __ZN7WebCore11HistoryItemD1Ev
 __ZN7WebCore11IconFetcher6cancelEv
@@ -81,13 +202,11 @@ __ZN7WebCore11IconFetcher6createEPNS_5FrameEPNS_17IconFetcherClientE
 __ZN7WebCore11RenderLayer18gAlignCenterAlwaysE
 __ZN7WebCore11RenderLayer19scrollRectToVisibleERKNS_7IntRectERKNS0_15ScrollAlignmentES6_
 __ZN7WebCore11RenderLayer20gAlignToEdgeIfNeededE
+__ZN7WebCore11currentTimeEv
+__ZN7WebCore11globalPointERK8_NSPointP8NSWindow
 __ZN7WebCore11toUserSpaceERK7_NSRectP8NSWindow
-__ZN7WebCore12applyCommandEN3WTF10PassRefPtrINS_11EditCommandEEE
 __ZN7WebCore12AtomicString3addEPKc
 __ZN7WebCore12AtomicString3addEPNS_10StringImplE
-__ZN7WebCore12cacheStorageEv
-__ZN7WebCore12createMarkupEPKNS_4NodeENS_13EChildrenOnlyEPN3WTF6VectorIPS0_Lm0EEE
-__ZN7WebCore12createMarkupEPKNS_5RangeEPN3WTF6VectorIPNS_4NodeELm0EEENS_23EAnnotateForInterchangeEb
 __ZN7WebCore12EventHandler10mouseMovedEP7NSEvent
 __ZN7WebCore12EventHandler10wheelEventEP7NSEvent
 __ZN7WebCore12EventHandler12mouseDraggedEP7NSEvent
@@ -106,7 +225,6 @@ __ZN7WebCore12EventHandler8keyEventERKNS_21PlatformKeyboardEventE
 __ZN7WebCore12EventHandler9mouseDownEP7NSEvent
 __ZN7WebCore12GCController17garbageCollectNowEv
 __ZN7WebCore12GCController43garbageCollectOnAlternateThreadForDebuggingEb
-__ZN7WebCore12gcControllerEv
 __ZN7WebCore12IconDatabase10setEnabledEb
 __ZN7WebCore12IconDatabase11defaultIconERKNS_7IntSizeE
 __ZN7WebCore12IconDatabase14iconForPageURLERKNS_6StringERKNS_7IntSizeE
@@ -116,8 +234,8 @@ __ZN7WebCore12IconDatabase17iconURLForPageURLERKNS_6StringE
 __ZN7WebCore12IconDatabase19pageURLMappingCountEv
 __ZN7WebCore12IconDatabase20allowDatabaseCleanupEv
 __ZN7WebCore12IconDatabase20delayDatabaseCleanupEv
-__ZN7WebCore12IconDatabase20retainedPageURLCountEv
 __ZN7WebCore12IconDatabase20retainIconForPageURLERKNS_6StringE
+__ZN7WebCore12IconDatabase20retainedPageURLCountEv
 __ZN7WebCore12IconDatabase20setIconURLForPageURLERKNS_6StringES3_
 __ZN7WebCore12IconDatabase21releaseIconForPageURLERKNS_6StringE
 __ZN7WebCore12IconDatabase21setIconDataForIconURLEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS_6StringE
@@ -130,7 +248,6 @@ __ZN7WebCore12IconDatabase27checkIntegrityBeforeOpeningEv
 __ZN7WebCore12IconDatabase4openERKNS_6StringE
 __ZN7WebCore12IconDatabase5closeEv
 __ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
-__ZN7WebCore12iconDatabaseEv
 __ZN7WebCore12SchedulePairC1EP9NSRunLoopPK10__CFString
 __ZN7WebCore12SharedBuffer10wrapNSDataEP6NSData
 __ZN7WebCore12SharedBuffer12createNSDataEv
@@ -139,15 +256,21 @@ __ZN7WebCore12TextIterator11rangeLengthEPKNS_5RangeEb
 __ZN7WebCore12TextIterator26rangeFromLocationAndLengthEPNS_7ElementEiib
 __ZN7WebCore12TextIterator7advanceEv
 __ZN7WebCore12TextIteratorC1EPKNS_5RangeEb
+__ZN7WebCore12applyCommandEN3WTF10PassRefPtrINS_11EditCommandEEE
+__ZN7WebCore12cacheStorageEv
+__ZN7WebCore12createMarkupEPKNS_4NodeENS_13EChildrenOnlyEPN3WTF6VectorIPS0_Lm0EEE
+__ZN7WebCore12createMarkupEPKNS_5RangeEPN3WTF6VectorIPNS_4NodeELm0EEENS_23EAnnotateForInterchangeEb
+__ZN7WebCore12gcControllerEv
+__ZN7WebCore12iconDatabaseEv
 __ZN7WebCore13AXObjectCache21gAccessibilityEnabledE
-__ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
 __ZN7WebCore13AXObjectCache3getEPNS_12RenderObjectE
+__ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
 __ZN7WebCore13HitTestResultC1ERKS0_
 __ZN7WebCore13HitTestResultD1Ev
 __ZN7WebCore13KeyboardEventC1ERKNS_12AtomicStringEbbPNS_9DOMWindowERKNS_6StringEjbbbbb
+__ZN7WebCore13TypingCommand39insertParagraphSeparatorInQuotedContentEPNS_8DocumentE
 __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
 __ZN7WebCore13toJSDOMWindowEPNS_5FrameE
-__ZN7WebCore13TypingCommand39insertParagraphSeparatorInQuotedContentEPNS_8DocumentE
 __ZN7WebCore14CachedResource12removeClientEPNS_20CachedResourceClientE
 __ZN7WebCore14DocumentLoader13attachToFrameEv
 __ZN7WebCore14DocumentLoader15detachFromFrameEv
@@ -220,13 +343,8 @@ __ZN7WebCore15StringTruncator14centerTruncateERKNS_6StringEfRKNS_4FontEb
 __ZN7WebCore15StringTruncator5widthERKNS_6StringERKNS_4FontEb
 __ZN7WebCore15VisiblePositionC1EPNS_4NodeEiNS_9EAffinityE
 __ZN7WebCore15VisiblePositionC1ERKNS_8PositionENS_9EAffinityE
-__ZN7WebCore16colorFromNSColorEP7NSColor
-__ZN7WebCore16createFullMarkupEPKNS_4NodeE
-__ZN7WebCore16createFullMarkupEPKNS_5RangeE
-__ZN7WebCore16enclosingIntRectERK7_NSRect
 __ZN7WebCore16FontPlatformDataC1EP6NSFontbb
 __ZN7WebCore16FontPlatformDataD1Ev
-__ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionE
 __ZN7WebCore16LegacyWebArchive19createFromSelectionEPNS_5FrameE
 __ZN7WebCore16LegacyWebArchive21rawDataRepresentationEv
 __ZN7WebCore16LegacyWebArchive6createEN3WTF10PassRefPtrINS_15ArchiveResourceEEERNS1_6VectorIS4_Lm0EEERNS5_INS2_IS0_EELm0EEE
@@ -243,20 +361,28 @@ __ZN7WebCore16MIMETypeRegistry32isSupportedImageResourceMIMETypeERKNS_6StringE
 __ZN7WebCore16NavigationActionC1ERKNS_4KURLENS_13FrameLoadTypeEb
 __ZN7WebCore16NavigationActionC1ERKNS_4KURLENS_14NavigationTypeE
 __ZN7WebCore16NavigationActionC1Ev
+__ZN7WebCore16colorFromNSColorEP7NSColor
+__ZN7WebCore16createFullMarkupEPKNS_4NodeE
+__ZN7WebCore16createFullMarkupEPKNS_5RangeE
+__ZN7WebCore16enclosingIntRectERK7_NSRect
+__ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionE
 __ZN7WebCore17DOMImplementation14isTextMIMETypeERKNS_6StringE
-__ZN7WebCore17equalIgnoringCaseEPNS_10StringImplES1_
 __ZN7WebCore17GlyphPageTreeNode18treeGlyphPageCountEv
-__ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionE
+__ZN7WebCore17equalIgnoringCaseEPNS_10StringImplES1_
 __ZN7WebCore18PlatformMouseEventC1EP7NSEvent
+__ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionE
 __ZN7WebCore19CSSStyleDeclaration11setPropertyERKNS_6StringES3_Ri
-__ZN7WebCore19InspectorController11showConsoleEv
 __ZN7WebCore19InspectorController12attachWindowEv
 __ZN7WebCore19InspectorController12detachWindowEv
-__ZN7WebCore19InspectorController12showTimelineEv
+__ZN7WebCore19InspectorController13stopDebuggingEv
 __ZN7WebCore19InspectorController16setWindowVisibleEb
+__ZN7WebCore19InspectorController26stopUserInitiatedProfilingEv
+__ZN7WebCore19InspectorController27startUserInitiatedProfilingEv
+__ZN7WebCore19InspectorController36startDebuggingAndReloadInspectedPageEv
 __ZN7WebCore19InspectorController4showEv
 __ZN7WebCore19InspectorController5closeEv
 __ZN7WebCore19InspectorController7inspectEPNS_4NodeE
+__ZN7WebCore19InspectorController9showPanelENS0_13SpecialPanelsE
 __ZN7WebCore19SelectionController10setFocusedEb
 __ZN7WebCore19SelectionController12setSelectionERKNS_9SelectionEbbb
 __ZN7WebCore19SelectionController16setSelectedRangeEPNS_5RangeENS_9EAffinityEb
@@ -270,18 +396,18 @@ __ZN7WebCore19TextResourceDecoderC1ERKNS_6StringERKNS_12TextEncodingE
 __ZN7WebCore19TextResourceDecoderD1Ev
 __ZN7WebCore20ResourceResponseBase24setExpectedContentLengthEx
 __ZN7WebCore21ContextMenuController16clearContextMenuEv
-__ZN7WebCore21findEventWithKeyStateEPNS_5EventE
-__ZN7WebCore21isBackForwardLoadTypeENS_13FrameLoadTypeE
 __ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS0_4TypeEb
 __ZN7WebCore21PlatformKeyboardEventC1EP7NSEvent
-__ZN7WebCore21reportThreadViolationEPKc
 __ZN7WebCore21WindowsLatin1EncodingEv
+__ZN7WebCore21findEventWithKeyStateEPNS_5EventE
+__ZN7WebCore21isBackForwardLoadTypeENS_13FrameLoadTypeE
+__ZN7WebCore21reportThreadViolationEPKc
 __ZN7WebCore22createFragmentFromTextEPNS_5RangeERKNS_6StringE
 __ZN7WebCore22externalRepresentationEPNS_12RenderObjectE
 __ZN7WebCore23ApplicationCacheStorage17setCacheDirectoryERKNS_6StringE
 __ZN7WebCore23ApplicationCacheStorage5emptyEv
-__ZN7WebCore23createFragmentFromNodesEPNS_8DocumentERKN3WTF6VectorIPNS_4NodeELm0EEE
 __ZN7WebCore23ReplaceSelectionCommandC1EPNS_8DocumentEN3WTF10PassRefPtrINS_16DocumentFragmentEEEbbbbbNS_10EditActionE
+__ZN7WebCore23createFragmentFromNodesEPNS_8DocumentERKN3WTF6VectorIPNS_4NodeELm0EEE
 __ZN7WebCore24createFragmentFromMarkupEPNS_8DocumentERKNS_6StringES4_
 __ZN7WebCore24decodeURLEscapeSequencesERKNS_6StringE
 __ZN7WebCore24notifyHistoryItemChangedE
@@ -295,10 +421,10 @@ __ZN7WebCore32plainTextToMallocAllocatedBufferEPKNS_5RangeERj
 __ZN7WebCore33setDefaultThreadViolationBehaviorENS_23ThreadViolationBehaviorE
 __ZN7WebCore36InitializeLoggingChannelsIfNecessaryEv
 __ZN7WebCore3macERKNS_23AuthenticationChallengeE
-__ZN7WebCore4FontaSERKS0_
 __ZN7WebCore4FontC1ERKNS_16FontPlatformDataEb
 __ZN7WebCore4FontC1Ev
 __ZN7WebCore4FontD1Ev
+__ZN7WebCore4FontaSERKS0_
 __ZN7WebCore4KURL10invalidateEv
 __ZN7WebCore4KURLC1EP5NSURL
 __ZN7WebCore4KURLC1ERKNS_6StringE
@@ -321,9 +447,6 @@ __ZN7WebCore4PageD1Ev
 __ZN7WebCore5Cache11setDisabledEb
 __ZN7WebCore5Cache13getStatisticsEv
 __ZN7WebCore5Cache13setCapacitiesEjjj
-__ZN7WebCore5cacheEv
-__ZN7WebCore5equalEPNS_10StringImplEPKc
-__ZN7WebCore5equalEPNS_10StringImplES1_
 __ZN7WebCore5Frame10findStringERKNS_6StringEbbbb
 __ZN7WebCore5Frame11forceLayoutEb
 __ZN7WebCore5Frame11scriptProxyEv
@@ -353,6 +476,9 @@ __ZN7WebCore5Range6createEN3WTF10PassRefPtrINS_8DocumentEEENS2_INS_4NodeEEEiS6_i
 __ZN7WebCore5Range6setEndEN3WTF10PassRefPtrINS_4NodeEEEiRi
 __ZN7WebCore5Range8setStartEN3WTF10PassRefPtrINS_4NodeEEEiRi
 __ZN7WebCore5RangeD1Ev
+__ZN7WebCore5cacheEv
+__ZN7WebCore5equalEPNS_10StringImplEPKc
+__ZN7WebCore5equalEPNS_10StringImplES1_
 __ZN7WebCore6Editor10applyStyleEPNS_19CSSStyleDeclarationENS_10EditActionE
 __ZN7WebCore6Editor10insertTextERKNS_6StringEPNS_5EventE
 __ZN7WebCore6Editor13canDHTMLPasteEv
@@ -391,8 +517,8 @@ __ZN7WebCore6Editor7commandERKNS_6StringE
 __ZN7WebCore6Editor7commandERKNS_6StringENS_19EditorCommandSourceE
 __ZN7WebCore6Editor7copyURLERKNS_4KURLERKNS_6StringE
 __ZN7WebCore6Editor7outdentEv
-__ZN7WebCore6String6appendEc
 __ZN7WebCore6String6appendERKS0_
+__ZN7WebCore6String6appendEc
 __ZN7WebCore6StringC1EP8NSString
 __ZN7WebCore6StringC1EPKc
 __ZN7WebCore6StringC1EPKcj
@@ -413,7 +539,6 @@ __ZN7WebCore6WidgetC2EP6NSView
 __ZN7WebCore6WidgetD2Ev
 __ZN7WebCore7IntSizeC1ERK7_NSSize
 __ZN7WebCore7nsColorERKNS_5ColorE
-__ZN7WebCore8blankURLEv
 __ZN7WebCore8Document11createRangeEv
 __ZN7WebCore8Document13removeMarkersENS_14DocumentMarker10MarkerTypeE
 __ZN7WebCore8Document14setFocusedNodeEN3WTF10PassRefPtrINS_4NodeEEE
@@ -426,12 +551,11 @@ __ZN7WebCore8DragDataC1EP11objc_objectRKNS_8IntPointES5_NS_13DragOperationEPNS_1
 __ZN7WebCore8FormDataD1Ev
 __ZN7WebCore8IntPointC1ERK8_NSPoint
 __ZN7WebCore8KJSProxy10initScriptEv
-__ZN7WebCore8parseURLERKNS_6StringE
 __ZN7WebCore8Settings14setJavaEnabledEb
 __ZN7WebCore8Settings16setUsesPageCacheEb
 __ZN7WebCore8Settings17setPluginsEnabledEb
-__ZN7WebCore8Settings18setDefaultFontSizeEi
 __ZN7WebCore8Settings18setDOMPasteAllowedEb
+__ZN7WebCore8Settings18setDefaultFontSizeEi
 __ZN7WebCore8Settings18setFixedFontFamilyERKNS_12AtomicStringE
 __ZN7WebCore8Settings18setMinimumFontSizeEi
 __ZN7WebCore8Settings18setSerifFontFamilyERKNS_12AtomicStringE
@@ -463,6 +587,8 @@ __ZN7WebCore8Settings35disableRangeMutationForOldAppleMailEb
 __ZN7WebCore8Settings36setOfflineWebApplicationCacheEnabledEb
 __ZN7WebCore8Settings40setJavaScriptCanOpenWindowsAutomaticallyEb
 __ZN7WebCore8Settings41setNeedsKeyboardEventDisambiguationQuirksEb
+__ZN7WebCore8blankURLEv
+__ZN7WebCore8parseURLERKNS_6StringE
 __ZN7WebCore9FloatRectC1ERK7_NSRect
 __ZN7WebCore9FontCache13fontDataCountEv
 __ZN7WebCore9FontCache21inactiveFontDataCountEv
@@ -507,10 +633,8 @@ __ZN7WebCore9HTMLNames7formTagE
 __ZN7WebCore9HTMLNames7srcAttrE
 __ZN7WebCore9HTMLNames8hrefAttrE
 __ZN7WebCore9HTMLNames8inputTagE
-__ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_
 __ZN7WebCore9PageCache11setCapacityEi
 __ZN7WebCore9PageCache27releaseAutoreleasedPagesNowEv
-__ZN7WebCore9pageCacheEv
 __ZN7WebCore9PageGroup14addVisitedLinkEPKtm
 __ZN7WebCore9PageGroup17closeLocalStorageEv
 __ZN7WebCore9PageGroup21removeAllVisitedLinksEv
@@ -521,6 +645,8 @@ __ZN7WebCore9TimerBase4stopEv
 __ZN7WebCore9TimerBase5startEdd
 __ZN7WebCore9TimerBaseC2Ev
 __ZN7WebCore9TimerBaseD2Ev
+__ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_
+__ZN7WebCore9pageCacheEv
 __ZN7WebCoreeqERKNS_19ResourceRequestBaseES2_
 __ZN7WebCoreplERKNS_6StringES2_
 __ZNK3KJS8Bindings10RootObject12globalObjectEv
@@ -679,14 +805,14 @@ __ZNK7WebCore6Editor17shouldDeleteRangeEPNS_5RangeE
 __ZNK7WebCore6Editor22selectionStartHasStyleEPNS_19CSSStyleDeclarationE
 __ZNK7WebCore6Editor23getCompositionSelectionERjS1_
 __ZNK7WebCore6Editor6canCutEv
-__ZNK7WebCore6Editor7canCopyEv
-__ZNK7WebCore6Editor7canEditEv
 __ZNK7WebCore6Editor7Command11isSupportedEv
 __ZNK7WebCore6Editor7Command15isTextInsertionEv
 __ZNK7WebCore6Editor7Command5stateEPNS_5EventE
 __ZNK7WebCore6Editor7Command7executeEPNS_5EventE
 __ZNK7WebCore6Editor7Command7executeERKNS_6StringEPNS_5EventE
 __ZNK7WebCore6Editor7Command9isEnabledEPNS_5EventE
+__ZNK7WebCore6Editor7canCopyEv
+__ZNK7WebCore6Editor7canEditEv
 __ZNK7WebCore6Editor8canPasteEv
 __ZNK7WebCore6Editor9canDeleteEv
 __ZNK7WebCore6String10charactersEv
@@ -725,21 +851,10 @@ __ZNK7WebCore9Selection23isContentRichlyEditableEv
 __ZNK7WebCore9Selection7toRangeEv
 __ZNK7WebCore9TimerBase8isActiveEv
 __ZTVN7WebCore12ChromeClientE
-_DOMEventException
-_DOMException
-_DOMRangeException
-_DOMXPathException
 _filenameByFixingIllegalCharacters
 _hasCaseInsensitiveSubstring
 _hasCaseInsensitiveSuffix
 _suggestedFilenameWithMIMEType
-_WebCoreDrawTextAtPoint
-_WebCoreFindFont
-_WebCoreObjCFinalizeOnMainThread
-_WebCoreSetAlwaysUseATSU
-_WebCoreSetShouldUseFontSmoothing
-_WebCoreShouldUseFontSmoothing
-_WebCoreTextFloatWidth
 _wkCGContextGetShouldSmoothFonts
 _wkClearGlyphVector
 _wkConvertCharToGlyphs
@@ -791,115 +906,3 @@ _wkSetUpFontCache
 _wkSignalCFReadStreamEnd
 _wkSignalCFReadStreamError
 _wkSignalCFReadStreamHasBytes
-.objc_class_name_DOMAbstractView
-.objc_class_name_DOMAttr
-.objc_class_name_DOMCDATASection
-.objc_class_name_DOMCharacterData
-.objc_class_name_DOMComment
-.objc_class_name_DOMCounter
-.objc_class_name_DOMCSSCharsetRule
-.objc_class_name_DOMCSSFontFaceRule
-.objc_class_name_DOMCSSImportRule
-.objc_class_name_DOMCSSMediaRule
-.objc_class_name_DOMCSSPageRule
-.objc_class_name_DOMCSSPrimitiveValue
-.objc_class_name_DOMCSSRule
-.objc_class_name_DOMCSSRuleList
-.objc_class_name_DOMCSSStyleDeclaration
-.objc_class_name_DOMCSSStyleRule
-.objc_class_name_DOMCSSStyleSheet
-.objc_class_name_DOMCSSUnknownRule
-.objc_class_name_DOMCSSValue
-.objc_class_name_DOMCSSValueList
-.objc_class_name_DOMDocument
-.objc_class_name_DOMDocumentFragment
-.objc_class_name_DOMDocumentType
-.objc_class_name_DOMElement
-.objc_class_name_DOMEntity
-.objc_class_name_DOMEntityReference
-.objc_class_name_DOMEvent
-.objc_class_name_DOMHTMLAnchorElement
-.objc_class_name_DOMHTMLAppletElement
-.objc_class_name_DOMHTMLAreaElement
-.objc_class_name_DOMHTMLBaseElement
-.objc_class_name_DOMHTMLBaseFontElement
-.objc_class_name_DOMHTMLBodyElement
-.objc_class_name_DOMHTMLBRElement
-.objc_class_name_DOMHTMLButtonElement
-.objc_class_name_DOMHTMLCollection
-.objc_class_name_DOMHTMLDirectoryElement
-.objc_class_name_DOMHTMLDivElement
-.objc_class_name_DOMHTMLDListElement
-.objc_class_name_DOMHTMLDocument
-.objc_class_name_DOMHTMLElement
-.objc_class_name_DOMHTMLEmbedElement
-.objc_class_name_DOMHTMLFieldSetElement
-.objc_class_name_DOMHTMLFontElement
-.objc_class_name_DOMHTMLFormElement
-.objc_class_name_DOMHTMLFrameElement
-.objc_class_name_DOMHTMLFrameSetElement
-.objc_class_name_DOMHTMLHeadElement
-.objc_class_name_DOMHTMLHeadingElement
-.objc_class_name_DOMHTMLHRElement
-.objc_class_name_DOMHTMLHtmlElement
-.objc_class_name_DOMHTMLIFrameElement
-.objc_class_name_DOMHTMLImageElement
-.objc_class_name_DOMHTMLInputElement
-.objc_class_name_DOMHTMLIsIndexElement
-.objc_class_name_DOMHTMLLabelElement
-.objc_class_name_DOMHTMLLegendElement
-.objc_class_name_DOMHTMLLIElement
-.objc_class_name_DOMHTMLLinkElement
-.objc_class_name_DOMHTMLMapElement
-.objc_class_name_DOMHTMLMenuElement
-.objc_class_name_DOMHTMLMetaElement
-.objc_class_name_DOMHTMLModElement
-.objc_class_name_DOMHTMLObjectElement
-.objc_class_name_DOMHTMLOListElement
-.objc_class_name_DOMHTMLOptGroupElement
-.objc_class_name_DOMHTMLOptionElement
-.objc_class_name_DOMHTMLOptionsCollection
-.objc_class_name_DOMHTMLParagraphElement
-.objc_class_name_DOMHTMLParamElement
-.objc_class_name_DOMHTMLPreElement
-.objc_class_name_DOMHTMLQuoteElement
-.objc_class_name_DOMHTMLScriptElement
-.objc_class_name_DOMHTMLSelectElement
-.objc_class_name_DOMHTMLStyleElement
-.objc_class_name_DOMHTMLTableCaptionElement
-.objc_class_name_DOMHTMLTableCellElement
-.objc_class_name_DOMHTMLTableColElement
-.objc_class_name_DOMHTMLTableElement
-.objc_class_name_DOMHTMLTableRowElement
-.objc_class_name_DOMHTMLTableSectionElement
-.objc_class_name_DOMHTMLTextAreaElement
-.objc_class_name_DOMHTMLTitleElement
-.objc_class_name_DOMHTMLUListElement
-.objc_class_name_DOMImplementation
-.objc_class_name_DOMKeyboardEvent
-.objc_class_name_DOMMediaList
-.objc_class_name_DOMMouseEvent
-.objc_class_name_DOMMutationEvent
-.objc_class_name_DOMNamedNodeMap
-.objc_class_name_DOMNode
-.objc_class_name_DOMNodeFilter
-.objc_class_name_DOMNodeIterator
-.objc_class_name_DOMNodeList
-.objc_class_name_DOMNotation
-.objc_class_name_DOMObject
-.objc_class_name_DOMProcessingInstruction
-.objc_class_name_DOMRange
-.objc_class_name_DOMRect
-.objc_class_name_DOMRGBColor
-.objc_class_name_DOMStyleSheet
-.objc_class_name_DOMStyleSheetList
-.objc_class_name_DOMText
-.objc_class_name_DOMTextEvent
-.objc_class_name_DOMTreeWalker
-.objc_class_name_DOMUIEvent
-.objc_class_name_DOMWheelEvent
-.objc_class_name_WebCoreKeyGenerator
-.objc_class_name_WebCoreViewFactory
-.objc_class_name_WebScriptObject
-.objc_class_name_WebScriptObjectPrivate
-.objc_class_name_WebUndefined
index b416582..038a1ec 100644 (file)
@@ -84,6 +84,8 @@ using namespace std;
 
 namespace WebCore {
 
+static const char* const UserInitiatedProfileName = "org.webkit.profiles.user-initiated";
+
 static JSRetainPtr<JSStringRef> jsStringRef(const char* str)
 {
     return JSRetainPtr<JSStringRef>(Adopt, JSStringCreateWithUTF8CString(str));
@@ -1016,7 +1018,9 @@ InspectorController::InspectorController(Page* page, InspectorClient* client)
     , m_scriptContext(0)
     , m_windowVisible(false)
     , m_debuggerAttached(false)
-    , m_showAfterVisible(FocusedNodeDocumentPanel)
+    , m_attachDebuggerWhenShown(false)
+    , m_recordingUserInitiatedProfile(false)
+    , m_showAfterVisible(ElementsPanel)
     , m_nextIdentifier(-2)
 {
     ASSERT_ARG(page, page);
@@ -1095,7 +1099,7 @@ void InspectorController::inspect(Node* node)
     m_nodeToFocus = node;
 
     if (!m_scriptObject) {
-        m_showAfterVisible = FocusedNodeDocumentPanel;
+        m_showAfterVisible = ElementsPanel;
         return;
     }
 
@@ -1166,14 +1170,12 @@ void InspectorController::setWindowVisible(bool visible)
         populateScriptObjects();
         if (m_nodeToFocus)
             focusNode();
-        if (m_showAfterVisible == ConsolePanel)
-            showConsole();
-        else if (m_showAfterVisible == TimelinePanel)
-            showTimeline();
+        if (m_attachDebuggerWhenShown)
+            startDebuggingAndReloadInspectedPage();
+        if (m_showAfterVisible != CurrentPanel)
+            showPanel(m_showAfterVisible);
     } else
         resetScriptObjects();
-
-    m_showAfterVisible = FocusedNodeDocumentPanel;
 }
 
 void InspectorController::addMessageToConsole(MessageSource source, MessageLevel level, ExecState* exec, const List& arguments, unsigned lineNumber, const String& sourceURL)
@@ -1338,7 +1340,7 @@ void InspectorController::show()
     showWindow();
 }
 
-void InspectorController::showConsole()
+void InspectorController::showPanel(SpecialPanels panel)
 {
     if (!enabled())
         return;
@@ -1346,26 +1348,40 @@ void InspectorController::showConsole()
     show();
 
     if (!m_scriptObject) {
-        m_showAfterVisible = ConsolePanel;
+        m_showAfterVisible = panel;
         return;
     }
 
-    callSimpleFunction(m_scriptContext, m_scriptObject, "showConsole");
-}
-
-void InspectorController::showTimeline()
-{
-    if (!enabled())
+    if (panel == CurrentPanel)
         return;
 
-    show();
-
-    if (!m_scriptObject) {
-        m_showAfterVisible = TimelinePanel;
-        return;
+    const char* showFunctionName;
+    switch (panel) {
+        case ConsolePanel:
+            showFunctionName = "showConsole";
+            break;
+        case DatabasesPanel:
+            showFunctionName = "showDatabasesPanel";
+            break;
+        case ElementsPanel:
+            showFunctionName = "showElementsPanel";
+            break;
+        case ProfilesPanel:
+            showFunctionName = "showProfilesPanel";
+            break;
+        case ResourcesPanel:
+            showFunctionName = "showResourcesPanel";
+            break;
+        case ScriptsPanel:
+            showFunctionName = "showScriptsPanel";
+            break;
+        default:
+            ASSERT_NOT_REACHED();
+            showFunctionName = 0;
     }
 
-    callSimpleFunction(m_scriptContext, m_scriptObject, "showTimeline");
+    if (showFunctionName)
+        callSimpleFunction(m_scriptContext, m_scriptObject, showFunctionName);
 }
 
 void InspectorController::close()
@@ -1395,6 +1411,28 @@ void InspectorController::closeWindow()
     m_client->closeWindow();
 }
 
+void InspectorController::startUserInitiatedProfiling()
+{
+    if (!enabled())
+        return;
+
+    m_recordingUserInitiatedProfile = true;
+
+    ExecState* exec = toJSDOMWindow(m_inspectedPage->mainFrame())->globalExec();
+    Profiler::profiler()->startProfiling(exec, UserInitiatedProfileName);
+}
+
+void InspectorController::stopUserInitiatedProfiling()
+{
+    if (!enabled())
+        return;
+
+    m_recordingUserInitiatedProfile = false;
+
+    ExecState* exec = toJSDOMWindow(m_inspectedPage->mainFrame())->globalExec();
+    Profiler::profiler()->stopProfiling(exec, UserInitiatedProfileName);
+}
+
 static void addHeaders(JSContextRef context, JSObjectRef object, const HTTPHeaderMap& headers, JSValueRef* exception)
 {
     ASSERT_ARG(context, context);
@@ -2150,20 +2188,39 @@ void InspectorController::moveWindowBy(float x, float y) const
 
 void InspectorController::startDebuggingAndReloadInspectedPage()
 {
+    if (!enabled())
+        return;
+
+    if (!m_scriptContext || !m_scriptObject) {
+        m_attachDebuggerWhenShown = true;
+        return;
+    }
+
     ASSERT(m_inspectedPage);
 
     JavaScriptDebugServer::shared().addListener(this, m_inspectedPage);
-    m_debuggerAttached = true;
     JavaScriptDebugServer::shared().clearBreakpoints();
+
+    m_debuggerAttached = true;
+    m_attachDebuggerWhenShown = false;
+
+    callSimpleFunction(m_scriptContext, m_scriptObject, "debuggerAttached");
+
     m_inspectedPage->mainFrame()->loader()->reload();
 }
 
 void InspectorController::stopDebugging()
 {
+    if (!enabled())
+        return;
+
     ASSERT(m_inspectedPage);
 
     JavaScriptDebugServer::shared().removeListener(this, m_inspectedPage);
     m_debuggerAttached = false;
+
+    if (m_scriptContext && m_scriptObject)
+        callSimpleFunction(m_scriptContext, m_scriptObject, "debuggerDetached");
 }
 
 JavaScriptCallFrame* InspectorController::currentCallFrame() const
index 89a7c95..2fd401f 100644 (file)
@@ -67,9 +67,13 @@ public:
     typedef HashSet<RefPtr<InspectorDatabaseResource> > DatabaseResourcesSet;
 
     typedef enum {
-        FocusedNodeDocumentPanel,
+        CurrentPanel,
         ConsolePanel,
-        TimelinePanel
+        DatabasesPanel,
+        ElementsPanel,
+        ProfilesPanel,
+        ResourcesPanel,
+        ScriptsPanel
     } SpecialPanels;
 
     InspectorController(Page*, InspectorClient*);
@@ -89,10 +93,13 @@ public:
     void hideHighlight();
 
     void show();
-    void showConsole();
-    void showTimeline();
+    void showPanel(SpecialPanels);
     void close();
 
+    bool isRecordingUserInitiatedProfile() const { return m_recordingUserInitiatedProfile; }
+    void startUserInitiatedProfiling();
+    void stopUserInitiatedProfiling();
+
     bool windowVisible();
     void setWindowVisible(bool visible = true);
 
@@ -214,6 +221,8 @@ private:
     JSContextRef m_scriptContext;
     bool m_windowVisible;
     bool m_debuggerAttached;
+    bool m_attachDebuggerWhenShown;
+    bool m_recordingUserInitiatedProfile;
     SpecialPanels m_showAfterVisible;
     long long m_nextIdentifier;
     RefPtr<Node> m_highlightedNode;
index 6252a4f..95a656b 100644 (file)
@@ -65,23 +65,16 @@ WebInspector.ProfilesPanel.prototype = {
         WebInspector.Panel.prototype.show.call(this);
         this._updateSidebarWidth();
 
-        if (this._populateProfiles) {
-            var profiles = InspectorController.profiles();
-            var profilesLength = profiles.length;
-            for (var i = 0; i < profilesLength; ++i) {
-                var profile = profiles[i];
-                this.addProfile(profile);
-            }
-
-            if (this.sidebarTree.children[0])
-                this.sidebarTree.children[0].select();
-
-            delete this._populateProfiles;
+        if (this._shouldPopulateProfiles) {
+            this._populateProfiles();
+            delete this._shouldPopulateProfiles;
         }
     },
 
     reset: function()
     {
+        this.nextUserInitiatedProfileNumber = 1;
+
         if (this._profiles) {
             var profiledLength = this._profiles.length;
             for (var i = 0; i < profiledLength; ++i) {
@@ -95,7 +88,10 @@ WebInspector.ProfilesPanel.prototype = {
         this.sidebarTree.removeChildren();
         this.profileViews.removeChildren();
 
-        this._populateProfiles = true;
+        if (this.visible)
+            this._populateProfiles();
+        else
+            this._shouldPopulateProfiles = true;
     },
 
     handleKeyEvent: function(event)
@@ -139,6 +135,21 @@ WebInspector.ProfilesPanel.prototype = {
         delete this.visibleProfileView;
     },
 
+    _populateProfiles: function()
+    {
+        this.sidebarTree.removeChildren();
+
+        var profiles = InspectorController.profiles();
+        var profilesLength = profiles.length;
+        for (var i = 0; i < profilesLength; ++i) {
+            var profile = profiles[i];
+            this.addProfile(profile);
+        }
+
+        if (this.sidebarTree.children[0])
+            this.sidebarTree.children[0].select();
+    },
+
     _startSidebarDragging: function(event)
     {
         WebInspector.elementDragStart(this.sidebarResizeElement, this._sidebarDragging.bind(this), this._endSidebarDragging.bind(this), event, "col-resize");
@@ -186,6 +197,9 @@ WebInspector.ProfileSidebarTreeElement = function(profile)
 {
     this.profile = profile;
 
+    if (this.profile.title === "org.webkit.profiles.user-initiated")
+        this._profileNumber = WebInspector.panels.profiles.nextUserInitiatedProfileNumber++;
+
     WebInspector.SidebarTreeElement.call(this, "profile-sidebar-tree-item", "", "", profile, false);
 
     this.refreshTitles();
@@ -199,6 +213,8 @@ WebInspector.ProfileSidebarTreeElement.prototype = {
 
     get mainTitle()
     {
+        if (this.profile.title === "org.webkit.profiles.user-initiated")
+            return WebInspector.UIString("Profile %d", this._profileNumber);
         return this.profile.title;
     },
 
index 528e402..7367d6c 100644 (file)
@@ -304,6 +304,16 @@ WebInspector.ScriptsPanel.prototype = {
         callStackPane.selectedCallFrame = currentFrame;
     },
 
+    debuggerAttached: function()
+    {
+        this.reset();
+    },
+
+    debuggerDetached: function()
+    {
+        this.reset();
+    },
+
     reset: function()
     {
         this.visibleView = null;
@@ -540,10 +550,15 @@ WebInspector.ScriptsPanel.prototype = {
             this.debuggingButton.title = WebInspector.UIString("Stop debugging.");
             this.debuggingButton.addStyleClass("toggled-on");
             this.pauseButton.disabled = false;
+
+            if (this.attachOverlayElement.parentNode)
+                this.attachOverlayElement.parentNode.removeChild(this.attachOverlayElement);
         } else {
             this.debuggingButton.title = WebInspector.UIString("Start debugging and reload inspected page.");
             this.debuggingButton.removeStyleClass("toggled-on");
             this.pauseButton.disabled = true;
+
+            this.element.appendChild(this.attachOverlayElement);
         }
 
         this._updatePauseOnExceptionsButton();
@@ -589,13 +604,10 @@ WebInspector.ScriptsPanel.prototype = {
         this._waitingToPause = false;
         this._stepping = false;
 
-        if (InspectorController.debuggerAttached()) {
-            this.element.appendChild(this.attachOverlayElement);
+        if (InspectorController.debuggerAttached())
             InspectorController.stopDebugging();
-        } else {
-            this.attachOverlayElement.parentNode.removeChild(this.attachOverlayElement);
+        else
             InspectorController.startDebuggingAndReloadInspectedPage();
-        }
 
         this._clearInterface();
     },
index 668e51b..9a52da5 100644 (file)
@@ -692,11 +692,31 @@ WebInspector.showConsole = function()
     this.console.show();
 }
 
-WebInspector.showTimeline = function()
+WebInspector.showElementsPanel = function()
+{
+    this.currentPanel = this.panels.elements;
+}
+
+WebInspector.showResourcesPanel = function()
 {
     this.currentPanel = this.panels.resources;
 }
 
+WebInspector.showScriptsPanel = function()
+{
+    this.currentPanel = this.panels.scripts;
+}
+
+WebInspector.showProfilesPanel = function()
+{
+    this.currentPanel = this.panels.profiles;
+}
+
+WebInspector.showDatabasesPanel = function()
+{
+    this.currentPanel = this.panels.databases;
+}
+
 WebInspector.addResource = function(resource)
 {
     this.resources.push(resource);
@@ -731,6 +751,16 @@ WebInspector.addDatabase = function(database)
     this.panels.databases.addDatabase(database);
 }
 
+WebInspector.debuggerAttached = function()
+{
+    this.panels.scripts.debuggerAttached();
+}
+
+WebInspector.debuggerDetached = function()
+{
+    this.panels.scripts.debuggerDetached();
+}
+
 WebInspector.parsedScriptSource = function(sourceID, sourceURL, source, startingLine)
 {
     this.panels.scripts.addScript(sourceID, sourceURL, source, startingLine);
index e887e2f..f8e7063 100644 (file)
@@ -1,3 +1,11 @@
+2008-05-22  Timothy Hatcher  <timothy@apple.com>
+
+        <rdar://problem/5956403> Update the Develop menu to match the new Inspector items
+
+        Reviewed by Adam Roben.
+
+        * English.lproj/Localizable.strings: Added new strings.
+
 2008-05-21  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Maciej.
index 82e2807..409216f 100644 (file)
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
index b9adb70..408d9db 100644 (file)
@@ -1,3 +1,28 @@
+2008-05-22  Timothy Hatcher  <timothy@apple.com>
+
+        <rdar://problem/5956403> Update the Develop menu to match the new Inspector items
+
+        Reviewed by Adam Roben.
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (-[WebInspectorWindowController showWebInspector:]):
+        (-[WebInspectorWindowController showErrorConsole:]):
+        (-[WebInspectorWindowController toggleDebuggingJavaScript:]):
+        (-[WebInspectorWindowController toggleProfilingJavaScript:]):
+        (-[WebInspectorWindowController validateUserInterfaceItem:]):
+        * WebInspector/WebInspector.h:
+        * WebInspector/WebInspector.mm:
+        (-[WebInspector showConsole:]):
+        (-[WebInspector showTimeline:]):
+        (-[WebInspector isDebuggingJavaScript]):
+        (-[WebInspector toggleDebuggingJavaScript:]):
+        (-[WebInspector startDebuggingJavaScript:]):
+        (-[WebInspector stopDebuggingJavaScript:]):
+        (-[WebInspector isProfilingJavaScript]):
+        (-[WebInspector toggleProfilingJavaScript:]):
+        (-[WebInspector startProfilingJavaScript:]):
+        (-[WebInspector stopProfilingJavaScript:]):
+
 2008-05-22  Josh Aas  <joshmoz@gmail.com>
 
         Reviewed by Anders.
index 1552032..930fb76 100644 (file)
@@ -30,6 +30,7 @@
 
 #import "WebFrameInternal.h"
 #import "WebFrameView.h"
+#import "WebInspector.h"
 #import "WebLocalizableStrings.h"
 #import "WebNodeHighlight.h"
 #import "WebPreferences.h"
@@ -509,17 +510,42 @@ void WebInspectorClient::updateWindowTitle() const
 // This method is really only implemented to keep any UI elements enabled.
 - (void)showWebInspector:(id)sender
 {
-    [_inspectedWebView page]->inspectorController()->show();
+    [[_inspectedWebView inspector] show:sender];
 }
 
 - (void)showErrorConsole:(id)sender
 {
-    [_inspectedWebView page]->inspectorController()->showConsole();
+    [[_inspectedWebView inspector] showConsole:sender];
 }
 
-- (void)showNetworkTimeline:(id)sender
+- (void)toggleDebuggingJavaScript:(id)sender
 {
-    [_inspectedWebView page]->inspectorController()->showTimeline();
+    [[_inspectedWebView inspector] toggleDebuggingJavaScript:sender];
+}
+
+- (void)toggleProfilingJavaScript:(id)sender
+{
+    [[_inspectedWebView inspector] toggleProfilingJavaScript:sender];
+}
+
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
+{
+    BOOL isMenuItem = [(id)item isKindOfClass:[NSMenuItem class]];
+    if ([item action] == @selector(toggleDebuggingJavaScript:) && isMenuItem) {
+        NSMenuItem *menuItem = (NSMenuItem *)item;
+        if ([[_inspectedWebView inspector] isDebuggingJavaScript])
+            [menuItem setTitle:UI_STRING("Stop Debugging JavaScript", "title for Stop Debugging JavaScript menu item")];
+        else
+            [menuItem setTitle:UI_STRING("Start Debugging JavaScript", "title for Start Debugging JavaScript menu item")];
+    } else if ([item action] == @selector(toggleProfilingJavaScript:) && isMenuItem) {
+        NSMenuItem *menuItem = (NSMenuItem *)item;
+        if ([[_inspectedWebView inspector] isProfilingJavaScript])
+            [menuItem setTitle:UI_STRING("Stop Profiling JavaScript", "title for Stop Profiling JavaScript menu item")];
+        else
+            [menuItem setTitle:UI_STRING("Start Profiling JavaScript", "title for Start Profiling JavaScript menu item")];
+    }
+
+    return YES;
 }
 
 @end
index ba4911a..ff6a978 100644 (file)
 - (void)webViewClosed;
 - (void)show:(id)sender;
 - (void)showConsole:(id)sender;
-- (void)showTimeline:(id)sender;
 - (void)close:(id)sender;
 - (void)attach:(id)sender;
 - (void)detach:(id)sender;
+
+- (BOOL)isDebuggingJavaScript;
+- (void)toggleDebuggingJavaScript:(id)sender;
+- (void)startDebuggingJavaScript:(id)sender;
+- (void)stopDebuggingJavaScript:(id)sender;
+
+- (BOOL)isProfilingJavaScript;
+- (void)toggleProfilingJavaScript:(id)sender;
+- (void)startProfilingJavaScript:(id)sender;
+- (void)stopProfilingJavaScript:(id)sender;
 @end
index 563f723..5c34a4a 100644 (file)
@@ -60,13 +60,72 @@ using namespace WebCore;
 - (void)showConsole:(id)sender
 {
     if (Page* page = core(_webView))
-        page->inspectorController()->showConsole();
+        page->inspectorController()->showPanel(InspectorController::ConsolePanel);
 }
 
 - (void)showTimeline:(id)sender
 {
+    // Not used anymore. Remove when a release of Safari non-longer calls this.
+}
+
+- (BOOL)isDebuggingJavaScript
+{
+    if (Page* page = core(_webView))
+        return page->inspectorController()->debuggerAttached();
+    return NO;
+}
+
+- (void)toggleDebuggingJavaScript:(id)sender
+{
+    if ([self isDebuggingJavaScript])
+        [self stopDebuggingJavaScript:sender];
+    else
+        [self startDebuggingJavaScript:sender];
+}
+
+- (void)startDebuggingJavaScript:(id)sender
+{
+    Page* page = core(_webView);
+    if (!page)
+        return;
+    page->inspectorController()->showPanel(InspectorController::ScriptsPanel);
+    page->inspectorController()->startDebuggingAndReloadInspectedPage();
+}
+
+- (void)stopDebuggingJavaScript:(id)sender
+{
     if (Page* page = core(_webView))
-        page->inspectorController()->showTimeline();
+        page->inspectorController()->stopDebugging();
+}
+
+- (BOOL)isProfilingJavaScript
+{
+    if (Page* page = core(_webView))
+        return page->inspectorController()->isRecordingUserInitiatedProfile();
+    return NO;
+}
+
+- (void)toggleProfilingJavaScript:(id)sender
+{
+    if ([self isProfilingJavaScript])
+        [self stopProfilingJavaScript:sender];
+    else
+        [self startProfilingJavaScript:sender];
+}
+
+- (void)startProfilingJavaScript:(id)sender
+{
+    if (Page* page = core(_webView))
+        page->inspectorController()->startUserInitiatedProfiling();
+}
+
+- (void)stopProfilingJavaScript:(id)sender
+{
+    Page* page = core(_webView);
+    if (!page)
+        return;
+    page->inspectorController()->stopUserInitiatedProfiling();
+    page->inspectorController()->showPanel(InspectorController::ProfilesPanel);
 }
 
 - (void)close:(id)sender 
index 8003d71..273557b 100644 (file)
@@ -1,3 +1,16 @@
+2008-05-22  Timothy Hatcher  <timothy@apple.com>
+
+        Changes to keep Windows building.
+
+        <rdar://problem/5956403> Update the Develop menu to match the new Inspector items
+
+        Reviewed by Adam Roben.
+
+        * English.lproj/Localizable.strings: Added new strings.
+        * WebInspector.cpp:
+        (WebInspector::showConsole): Call showPanel.
+        * WebInspector.h:
+
 2008-05-21  Adele Peterson  <adele@apple.com>
 
         Reviewed by Adam.
index 0b55aef..409216f 100644 (file)
Binary files a/WebKit/win/English.lproj/Localizable.strings and b/WebKit/win/English.lproj/Localizable.strings differ
index d188e4f..2dc4772 100644 (file)
@@ -106,16 +106,7 @@ HRESULT STDMETHODCALLTYPE WebInspector::showConsole()
 {
     if (m_webView)
         if (Page* page = m_webView->page())
-            page->inspectorController()->showConsole();
-
-    return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE WebInspector::showTimeline()
-{
-    if (m_webView)
-        if (Page* page = m_webView->page())
-            page->inspectorController()->showTimeline();
+            page->inspectorController()->showPanel(InspectorController::ConsolePanel);
 
     return S_OK;
 }
index 8966963..6a49ce8 100644 (file)
@@ -46,7 +46,6 @@ public:
 
     virtual HRESULT STDMETHODCALLTYPE show();
     virtual HRESULT STDMETHODCALLTYPE showConsole();
-    virtual HRESULT STDMETHODCALLTYPE showTimeline();
     virtual HRESULT STDMETHODCALLTYPE close();
     virtual HRESULT STDMETHODCALLTYPE attach();
     virtual HRESULT STDMETHODCALLTYPE detach();