diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 08:15:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-25 08:15:24 -0700 |
| commit | fa91a01aee5d4a80ca6c80f722116b850f09996c (patch) | |
| tree | f72740e60d3c3d4f0ab144e88c03d1f134944ce3 /Source/WebCore/inspector/front-end/WebKit.qrc | |
| parent | 96f37d6d1b390f6690858789706ee6ec25bc1677 (diff) | |
| parent | feebf8e7a79ad68b04a1a948e2b8078d6e5f0048 (diff) | |
| download | external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.zip external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.gz external_webkit-fa91a01aee5d4a80ca6c80f722116b850f09996c.tar.bz2 | |
Merge changes I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f
* changes:
Merge WebKit at r78450: Update ThirdPartyProject.prop
Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()
Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed
Merge WebKit at r78450: HTMLAreaElement::getRect() renamed
Merge WebKit at r78450: FrameLoader::url() removed
Merge WebKit at r78450: HTMLParserQuirks removed
Merge WebKit at r78450: TextRun::padding() renamed
Merge WebKit at r78450: Use new FontMetrics
Merge WebKit at r78450: GraphicsContext current path removed
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
Merge WebKit at r78450: IntRect::bottom()/right() renamed
Merge WebKit at r78450: Fix remaining conflicts
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
Merge WebKit at r78450: Fix conflicts in media controls
Merge WebKit at r78450: Fix Makefiles
Merge WebKit at r78450: Initial merge by git.
Diffstat (limited to 'Source/WebCore/inspector/front-end/WebKit.qrc')
| -rw-r--r-- | Source/WebCore/inspector/front-end/WebKit.qrc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebCore/inspector/front-end/WebKit.qrc b/Source/WebCore/inspector/front-end/WebKit.qrc index edc1861..dd325ba 100644 --- a/Source/WebCore/inspector/front-end/WebKit.qrc +++ b/Source/WebCore/inspector/front-end/WebKit.qrc @@ -13,7 +13,6 @@ <file>BreakpointManager.js</file> <file>BreakpointsSidebarPane.js</file> <file>CallStackSidebarPane.js</file> - <file>ChangesView.js</file> <file>Checkbox.js</file> <file>Color.js</file> <file>ConsolePanel.js</file> @@ -28,6 +27,7 @@ <file>Database.js</file> <file>DatabaseQueryView.js</file> <file>DatabaseTableView.js</file> + <file>DetailedHeapshotView.js</file> <file>DataGrid.js</file> <file>DebuggerModel.js</file> <file>DOMAgent.js</file> @@ -44,10 +44,10 @@ <file>ExtensionPanel.js</file> <file>ExtensionRegistryStub.js</file> <file>ExtensionServer.js</file> - <file>FileSystemView.js</file> <file>FontView.js</file> <file>GoToLineDialog.js</file> <file>HAREntry.js</file> + <file>HeapSnapshot.js</file> <file>HeapSnapshotView.js</file> <file>HelpScreen.js</file> <file>ImageView.js</file> @@ -64,6 +64,7 @@ <file>Panel.js</file> <file>PanelEnablerView.js</file> <file>Placard.js</file> + <file>PleaseWaitMessage.js</file> <file>Popover.js</file> <file>ProfileDataGridTree.js</file> <file>ProfilesPanel.js</file> @@ -84,18 +85,18 @@ <file>ScriptFormatter.js</file> <file>ScriptFormatterWorker.js</file> <file>ScriptsPanel.js</file> - <file>ScriptView.js</file> <file>Section.js</file> <file>Settings.js</file> <file>ShortcutsHelp.js</file> + <file>ShowMoreDataGridNode.js</file> <file>SidebarPane.js</file> <file>SidebarTreeElement.js</file> <file>SourceCSSTokenizer.js</file> <file>SourceFrame.js</file> + <file>SourceFrameContent.js</file> <file>SourceHTMLTokenizer.js</file> <file>SourceJavaScriptTokenizer.js</file> <file>SourceTokenizer.js</file> - <file>SourceView.js</file> <file>StatusBarButton.js</file> <file>StylesSidebarPane.js</file> <file>SummaryBar.js</file> |