Bug 1044448 - Flatten view/{public,src}/ directories. r=roc

--HG-- rename : view/src/Makefile.in => view/Makefile.in rename : view/src/nsView.cpp => view/nsView.cpp rename : view/public/nsView.h => view/nsView.h rename : view/src/nsViewManager.cpp => view/nsViewManager.cpp rename : view/public/nsViewManager.h => view/nsViewManager.h
EtlerEdelgard · Jul 29, 2014 · 7e107d5 · 7e107d5
1 parent db29727
commit 7e107d5
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 32 deletions.
diff --git a/layout/base/moz.build b/layout/base/moz.build
@@ -116,7 +116,6 @@ LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
     '../../content/svg/content/src',
-    '../../view/src',
     '../forms',
     '../generic',
     '../mathml',
@@ -129,6 +128,7 @@ LOCAL_INCLUDES += [
     '/docshell/base',
     '/dom/base',
     '/dom/xbl',
+    '/view',
 ]
 
 FINAL_LIBRARY = 'xul'

diff --git a/layout/build/moz.build b/layout/build/moz.build
@@ -75,7 +75,7 @@ LOCAL_INCLUDES += [
     '/js/xpconnect/src',
     '/netwerk/base/src',
     '/netwerk/cookie',
-    '/view/src',
+    '/view',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):

diff --git a/view/src/Makefile.in → view/Makefile.in b/view/src/Makefile.in → view/Makefile.in
diff --git a/view/moz.build b/view/moz.build
@@ -4,5 +4,19 @@
 # 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 += ['public', 'src']
+EXPORTS += [
+    'nsView.h',
+    'nsViewManager.h',
+]
 
+# nsViewManager.cpp cannot be built in unified mode because it uses PL_ARENA_CONST_ALIGN_MASK.
+SOURCES += [
+    'nsView.cpp',
+    'nsViewManager.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'
diff --git a/view/src/nsView.cpp → view/nsView.cpp b/view/src/nsView.cpp → view/nsView.cpp
diff --git a/view/public/nsView.h → view/nsView.h b/view/public/nsView.h → view/nsView.h
diff --git a/view/src/nsViewManager.cpp → view/nsViewManager.cpp b/view/src/nsViewManager.cpp → view/nsViewManager.cpp
diff --git a/view/public/nsViewManager.h → view/nsViewManager.h b/view/public/nsViewManager.h → view/nsViewManager.h
diff --git a/view/public/moz.build b/view/public/moz.build
diff --git a/view/src/moz.build b/view/src/moz.build
diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build
@@ -82,7 +82,7 @@ LOCAL_INCLUDES += [
     '/layout/forms',
     '/layout/generic',
     '/layout/xul',
-    '/view/src',
+    '/view',
 ]
 
 widget_dir = CONFIG['MOZ_WIDGET_TOOLKIT']