Bug 1054703 - Part 8: Flatten embedding/browser/webBrowser/ into parent directory. r=bsmedberg
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 20 Aug 2014 10:27:17 -0700
changeset 200621 0197daa3451668b39331537168076320b67066ff
parent 200620 057489bb1a6934499c2f1b6048702867ae59ba84
child 200622 8427a3f3067f7e12680f451e4554b3f0338a9a86
push id47948
push userbirunthan@mohanathas.com
push dateWed, 20 Aug 2014 18:11:21 +0000
treeherdermozilla-inbound@8427a3f3067f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1054703
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1054703 - Part 8: Flatten embedding/browser/webBrowser/ into parent directory. r=bsmedberg
embedding/browser/build/moz.build
embedding/browser/moz.build
embedding/browser/nsCTooltipTextProvider.h
embedding/browser/nsCWebBrowser.idl
embedding/browser/nsCommandHandler.cpp
embedding/browser/nsCommandHandler.h
embedding/browser/nsContextMenuInfo.cpp
embedding/browser/nsContextMenuInfo.h
embedding/browser/nsDocShellTreeOwner.cpp
embedding/browser/nsDocShellTreeOwner.h
embedding/browser/nsEmbedStream.cpp
embedding/browser/nsEmbedStream.h
embedding/browser/nsICommandHandler.idl
embedding/browser/nsIContextMenuListener.idl
embedding/browser/nsIContextMenuListener2.idl
embedding/browser/nsIEmbeddingSiteWindow.idl
embedding/browser/nsIPrintPreviewNavigation.idl
embedding/browser/nsIPrintingPrompt.idl
embedding/browser/nsIPrintingPromptService.idl
embedding/browser/nsITooltipListener.idl
embedding/browser/nsITooltipTextProvider.idl
embedding/browser/nsIWebBrowser.idl
embedding/browser/nsIWebBrowserChrome.idl
embedding/browser/nsIWebBrowserChrome2.idl
embedding/browser/nsIWebBrowserChrome3.idl
embedding/browser/nsIWebBrowserChromeFocus.idl
embedding/browser/nsIWebBrowserFocus.idl
embedding/browser/nsIWebBrowserPrint.idl
embedding/browser/nsIWebBrowserSetup.idl
embedding/browser/nsIWebBrowserStream.idl
embedding/browser/nsWebBrowser.cpp
embedding/browser/nsWebBrowser.h
embedding/browser/nsWebBrowserContentPolicy.cpp
embedding/browser/nsWebBrowserContentPolicy.h
embedding/browser/webBrowser/moz.build
embedding/browser/webBrowser/nsCTooltipTextProvider.h
embedding/browser/webBrowser/nsCWebBrowser.idl
embedding/browser/webBrowser/nsCommandHandler.cpp
embedding/browser/webBrowser/nsCommandHandler.h
embedding/browser/webBrowser/nsContextMenuInfo.cpp
embedding/browser/webBrowser/nsContextMenuInfo.h
embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
embedding/browser/webBrowser/nsDocShellTreeOwner.h
embedding/browser/webBrowser/nsEmbedStream.cpp
embedding/browser/webBrowser/nsEmbedStream.h
embedding/browser/webBrowser/nsICommandHandler.idl
embedding/browser/webBrowser/nsIContextMenuListener.idl
embedding/browser/webBrowser/nsIContextMenuListener2.idl
embedding/browser/webBrowser/nsIEmbeddingSiteWindow.idl
embedding/browser/webBrowser/nsIPrintPreviewNavigation.idl
embedding/browser/webBrowser/nsIPrintingPrompt.idl
embedding/browser/webBrowser/nsIPrintingPromptService.idl
embedding/browser/webBrowser/nsITooltipListener.idl
embedding/browser/webBrowser/nsITooltipTextProvider.idl
embedding/browser/webBrowser/nsIWebBrowser.idl
embedding/browser/webBrowser/nsIWebBrowserChrome.idl
embedding/browser/webBrowser/nsIWebBrowserChrome2.idl
embedding/browser/webBrowser/nsIWebBrowserChrome3.idl
embedding/browser/webBrowser/nsIWebBrowserChromeFocus.idl
embedding/browser/webBrowser/nsIWebBrowserFocus.idl
embedding/browser/webBrowser/nsIWebBrowserPrint.idl
embedding/browser/webBrowser/nsIWebBrowserSetup.idl
embedding/browser/webBrowser/nsIWebBrowserStream.idl
embedding/browser/webBrowser/nsWebBrowser.cpp
embedding/browser/webBrowser/nsWebBrowser.h
embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp
embedding/browser/webBrowser/nsWebBrowserContentPolicy.h
--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -7,12 +7,11 @@
 SOURCES += [
     'nsWebBrowserModule.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../setup',
-    '../webBrowser',
+    '..',
 ]
 
--- a/embedding/browser/moz.build
+++ b/embedding/browser/moz.build
@@ -1,7 +1,55 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['webBrowser', 'build']
+DIRS += ['build']
+
+XPIDL_SOURCES += [
+    'nsCWebBrowser.idl',
+    'nsICommandHandler.idl',
+    'nsIContextMenuListener.idl',
+    'nsIContextMenuListener2.idl',
+    'nsIEmbeddingSiteWindow.idl',
+    'nsITooltipListener.idl',
+    'nsITooltipTextProvider.idl',
+    'nsIWebBrowser.idl',
+    'nsIWebBrowserChrome.idl',
+    'nsIWebBrowserChrome2.idl',
+    'nsIWebBrowserChrome3.idl',
+    'nsIWebBrowserChromeFocus.idl',
+    'nsIWebBrowserFocus.idl',
+    'nsIWebBrowserSetup.idl',
+    'nsIWebBrowserStream.idl',
+]
+
+if CONFIG['NS_PRINTING']:
+    XPIDL_SOURCES += [
+        'nsIPrintingPrompt.idl',
+        'nsIPrintingPromptService.idl',
+        'nsIWebBrowserPrint.idl',
+    ]
+
+XPIDL_MODULE = 'webBrowser_core'
+
+EXPORTS += [
+    'nsCTooltipTextProvider.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsCommandHandler.cpp',
+    'nsContextMenuInfo.cpp',
+    'nsDocShellTreeOwner.cpp',
+    'nsEmbedStream.cpp',
+    'nsWebBrowser.cpp',
+    'nsWebBrowserContentPolicy.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/svg/content/src',
+]
rename from embedding/browser/webBrowser/nsCTooltipTextProvider.h
rename to embedding/browser/nsCTooltipTextProvider.h
rename from embedding/browser/webBrowser/nsCWebBrowser.idl
rename to embedding/browser/nsCWebBrowser.idl
rename from embedding/browser/webBrowser/nsCommandHandler.cpp
rename to embedding/browser/nsCommandHandler.cpp
rename from embedding/browser/webBrowser/nsCommandHandler.h
rename to embedding/browser/nsCommandHandler.h
rename from embedding/browser/webBrowser/nsContextMenuInfo.cpp
rename to embedding/browser/nsContextMenuInfo.cpp
rename from embedding/browser/webBrowser/nsContextMenuInfo.h
rename to embedding/browser/nsContextMenuInfo.h
rename from embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
rename to embedding/browser/nsDocShellTreeOwner.cpp
rename from embedding/browser/webBrowser/nsDocShellTreeOwner.h
rename to embedding/browser/nsDocShellTreeOwner.h
rename from embedding/browser/webBrowser/nsEmbedStream.cpp
rename to embedding/browser/nsEmbedStream.cpp
rename from embedding/browser/webBrowser/nsEmbedStream.h
rename to embedding/browser/nsEmbedStream.h
rename from embedding/browser/webBrowser/nsICommandHandler.idl
rename to embedding/browser/nsICommandHandler.idl
rename from embedding/browser/webBrowser/nsIContextMenuListener.idl
rename to embedding/browser/nsIContextMenuListener.idl
rename from embedding/browser/webBrowser/nsIContextMenuListener2.idl
rename to embedding/browser/nsIContextMenuListener2.idl
rename from embedding/browser/webBrowser/nsIEmbeddingSiteWindow.idl
rename to embedding/browser/nsIEmbeddingSiteWindow.idl
rename from embedding/browser/webBrowser/nsIPrintPreviewNavigation.idl
rename to embedding/browser/nsIPrintPreviewNavigation.idl
rename from embedding/browser/webBrowser/nsIPrintingPrompt.idl
rename to embedding/browser/nsIPrintingPrompt.idl
rename from embedding/browser/webBrowser/nsIPrintingPromptService.idl
rename to embedding/browser/nsIPrintingPromptService.idl
rename from embedding/browser/webBrowser/nsITooltipListener.idl
rename to embedding/browser/nsITooltipListener.idl
rename from embedding/browser/webBrowser/nsITooltipTextProvider.idl
rename to embedding/browser/nsITooltipTextProvider.idl
rename from embedding/browser/webBrowser/nsIWebBrowser.idl
rename to embedding/browser/nsIWebBrowser.idl
rename from embedding/browser/webBrowser/nsIWebBrowserChrome.idl
rename to embedding/browser/nsIWebBrowserChrome.idl
rename from embedding/browser/webBrowser/nsIWebBrowserChrome2.idl
rename to embedding/browser/nsIWebBrowserChrome2.idl
rename from embedding/browser/webBrowser/nsIWebBrowserChrome3.idl
rename to embedding/browser/nsIWebBrowserChrome3.idl
rename from embedding/browser/webBrowser/nsIWebBrowserChromeFocus.idl
rename to embedding/browser/nsIWebBrowserChromeFocus.idl
rename from embedding/browser/webBrowser/nsIWebBrowserFocus.idl
rename to embedding/browser/nsIWebBrowserFocus.idl
rename from embedding/browser/webBrowser/nsIWebBrowserPrint.idl
rename to embedding/browser/nsIWebBrowserPrint.idl
rename from embedding/browser/webBrowser/nsIWebBrowserSetup.idl
rename to embedding/browser/nsIWebBrowserSetup.idl
rename from embedding/browser/webBrowser/nsIWebBrowserStream.idl
rename to embedding/browser/nsIWebBrowserStream.idl
rename from embedding/browser/webBrowser/nsWebBrowser.cpp
rename to embedding/browser/nsWebBrowser.cpp
rename from embedding/browser/webBrowser/nsWebBrowser.h
rename to embedding/browser/nsWebBrowser.h
rename from embedding/browser/webBrowser/nsWebBrowserContentPolicy.cpp
rename to embedding/browser/nsWebBrowserContentPolicy.cpp
rename from embedding/browser/webBrowser/nsWebBrowserContentPolicy.h
rename to embedding/browser/nsWebBrowserContentPolicy.h
deleted file mode 100644
--- a/embedding/browser/webBrowser/moz.build
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'nsCWebBrowser.idl',
-    'nsICommandHandler.idl',
-    'nsIContextMenuListener.idl',
-    'nsIContextMenuListener2.idl',
-    'nsIEmbeddingSiteWindow.idl',
-    'nsITooltipListener.idl',
-    'nsITooltipTextProvider.idl',
-    'nsIWebBrowser.idl',
-    'nsIWebBrowserChrome.idl',
-    'nsIWebBrowserChrome2.idl',
-    'nsIWebBrowserChrome3.idl',
-    'nsIWebBrowserChromeFocus.idl',
-    'nsIWebBrowserFocus.idl',
-    'nsIWebBrowserSetup.idl',
-    'nsIWebBrowserStream.idl',
-]
-
-if CONFIG['NS_PRINTING']:
-    XPIDL_SOURCES += [
-        'nsIPrintingPrompt.idl',
-        'nsIPrintingPromptService.idl',
-        'nsIWebBrowserPrint.idl',
-    ]
-
-XPIDL_MODULE = 'webBrowser_core'
-
-EXPORTS += [
-    'nsCTooltipTextProvider.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsCommandHandler.cpp',
-    'nsContextMenuInfo.cpp',
-    'nsDocShellTreeOwner.cpp',
-    'nsEmbedStream.cpp',
-    'nsWebBrowser.cpp',
-    'nsWebBrowserContentPolicy.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '../../../content/base/src',
-    '../../../content/svg/content/src',
-]
-