mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 903174 - Move GonkNativeWindow to /widget/gonk/nativewindow. r=vlad
This commit is contained in:
parent
45d2b90a2c
commit
3a446332af
@ -24,8 +24,6 @@ EXPORTS += [
|
|||||||
'CameraPreviewMediaStream.h',
|
'CameraPreviewMediaStream.h',
|
||||||
'DOMCameraManager.h',
|
'DOMCameraManager.h',
|
||||||
'GonkCameraControl.h',
|
'GonkCameraControl.h',
|
||||||
'GonkNativeWindow.h',
|
|
||||||
'GonkNativeWindowClient.h',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
CPP_SOURCES += [
|
CPP_SOURCES += [
|
||||||
@ -43,20 +41,11 @@ if CONFIG['MOZ_B2G_CAMERA']:
|
|||||||
'GonkCameraManager.cpp',
|
'GonkCameraManager.cpp',
|
||||||
'GonkCameraControl.cpp',
|
'GonkCameraControl.cpp',
|
||||||
'GonkCameraHwMgr.cpp',
|
'GonkCameraHwMgr.cpp',
|
||||||
'GonkNativeWindow.cpp',
|
|
||||||
'GonkNativeWindowClient.cpp',
|
|
||||||
'GonkRecorder.cpp',
|
'GonkRecorder.cpp',
|
||||||
'GonkCameraSource.cpp',
|
'GonkCameraSource.cpp',
|
||||||
'AudioParameter.cpp',
|
'AudioParameter.cpp',
|
||||||
'GonkRecorderProfiles.cpp',
|
'GonkRecorderProfiles.cpp',
|
||||||
]
|
]
|
||||||
elif CONFIG['MOZ_OMX_DECODER']:
|
|
||||||
CPP_SOURCES += [
|
|
||||||
'FallbackCameraManager.cpp',
|
|
||||||
'FallbackCameraControl.cpp',
|
|
||||||
'GonkNativeWindow.cpp',
|
|
||||||
'GonkNativeWindowClient.cpp',
|
|
||||||
]
|
|
||||||
else:
|
else:
|
||||||
CPP_SOURCES += [
|
CPP_SOURCES += [
|
||||||
'FallbackCameraManager.cpp',
|
'FallbackCameraManager.cpp',
|
||||||
|
@ -461,6 +461,7 @@ OS_LIBS += \
|
|||||||
-lstagefright_omx \
|
-lstagefright_omx \
|
||||||
-lbinder \
|
-lbinder \
|
||||||
-lgui \
|
-lgui \
|
||||||
|
$(DEPTH)/widget/gonk/nativewindow/$(LIB_PREFIX)nativewindow.$(LIB_SUFFIX) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ EXPORTS += [
|
|||||||
'OrientationObserver.h',
|
'OrientationObserver.h',
|
||||||
]
|
]
|
||||||
|
|
||||||
DIRS += ['libdisplay']
|
DIRS += ['libdisplay', 'nativewindow']
|
||||||
|
|
||||||
CPP_SOURCES += [
|
CPP_SOURCES += [
|
||||||
'EventHub.cpp',
|
'EventHub.cpp',
|
||||||
|
2
widget/gonk/nativewindow/GonkNativeWindow.h
Normal file
2
widget/gonk/nativewindow/GonkNativeWindow.h
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
|
||||||
|
#include "GonkNativeWindowICS.h"
|
2
widget/gonk/nativewindow/GonkNativeWindowClient.h
Normal file
2
widget/gonk/nativewindow/GonkNativeWindowClient.h
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
|
||||||
|
#include "GonkNativeWindowClientICS.h"
|
@ -15,8 +15,8 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef DOM_CAMERA_GONKNATIVEWINDOWCLIENT_H
|
#ifndef NATIVEWINDOW_GONKNATIVEWINDOWCLIENT_ICS_H
|
||||||
#define DOM_CAMERA_GONKNATIVEWINDOWCLIENT_H
|
#define NATIVEWINDOW_GONKNATIVEWINDOWCLIENT_ICS_H
|
||||||
|
|
||||||
#include <ui/egl/android_natives.h>
|
#include <ui/egl/android_natives.h>
|
||||||
|
|
||||||
@ -127,10 +127,10 @@ private:
|
|||||||
// member variables are accessed.
|
// member variables are accessed.
|
||||||
mutable Mutex mMutex;
|
mutable Mutex mMutex;
|
||||||
|
|
||||||
bool mConnectedToCpu;
|
bool mConnectedToCpu;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
}; // namespace android
|
}; // namespace android
|
||||||
|
|
||||||
#endif // DOM_CAMERA_GONKNATIVEWINDOWCLIENT_H
|
#endif // NATIVEWINDOW_GONKNATIVEWINDOWCLIENT_ICS_H
|
@ -16,7 +16,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "base/basictypes.h"
|
#include "base/basictypes.h"
|
||||||
#include "GonkCameraHwMgr.h"
|
|
||||||
#include "mozilla/layers/ShadowLayers.h"
|
#include "mozilla/layers/ShadowLayers.h"
|
||||||
#include "mozilla/layers/ShadowLayerUtilsGralloc.h"
|
#include "mozilla/layers/ShadowLayerUtilsGralloc.h"
|
||||||
#include "mozilla/layers/ImageBridgeChild.h"
|
#include "mozilla/layers/ImageBridgeChild.h"
|
@ -15,8 +15,8 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef DOM_CAMERA_GONKNATIVEWINDOW_H
|
#ifndef NATIVEWINDOW_GONKNATIVEWINDOW_ICS_H
|
||||||
#define DOM_CAMERA_GONKNATIVEWINDOW_H
|
#define NATIVEWINDOW_GONKNATIVEWINDOW_ICS_H
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -349,4 +349,4 @@ protected:
|
|||||||
|
|
||||||
}; // namespace android
|
}; // namespace android
|
||||||
|
|
||||||
#endif // DOM_CAMERA_GONKNATIVEWINDOW_H
|
#endif // NATIVEWINDOW_GONKNATIVEWINDOW_ICS_H
|
27
widget/gonk/nativewindow/Makefile.in
Normal file
27
widget/gonk/nativewindow/Makefile.in
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
# Copyright 2013 Mozilla Foundation and Mozilla contributors
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
DEPTH = @DEPTH@
|
||||||
|
topsrcdir = @top_srcdir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
VPATH = @srcdir@
|
||||||
|
|
||||||
|
include $(DEPTH)/config/autoconf.mk
|
||||||
|
|
||||||
|
LIBRARY_NAME = nativewindow
|
||||||
|
LIBXUL_LIBRARY = 1
|
||||||
|
FAIL_ON_WARNINGS := 1
|
||||||
|
STL_FLAGS=
|
||||||
|
|
||||||
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
include $(topsrcdir)/ipc/chromium/chromium-config.mk
|
34
widget/gonk/nativewindow/moz.build
Normal file
34
widget/gonk/nativewindow/moz.build
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||||
|
# vim: set filetype=python:
|
||||||
|
# Copyright 2013 Mozilla Foundation and Mozilla contributors
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
MODULE = 'nativewindow'
|
||||||
|
|
||||||
|
EXPORTS += [
|
||||||
|
'GonkNativeWindow.h',
|
||||||
|
'GonkNativeWindowClient.h',
|
||||||
|
]
|
||||||
|
|
||||||
|
EXPORTS += [
|
||||||
|
'GonkNativeWindowClientICS.h',
|
||||||
|
'GonkNativeWindowICS.h',
|
||||||
|
]
|
||||||
|
|
||||||
|
if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['MOZ_OMX_DECODER']:
|
||||||
|
CPP_SOURCES += [
|
||||||
|
'GonkNativeWindowICS.cpp',
|
||||||
|
'GonkNativeWindowClientICS.cpp',
|
||||||
|
]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user