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

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'

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'):

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'

view/public/moz.build

@@ -1,11 +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/.
-
-EXPORTS += [
-    'nsView.h',
-    'nsViewManager.h',
-]
-

view/src/moz.build

@@ -1,17 +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/.
-
-# 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'

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']