Bug 868065 - Move GraphicBuffer.h include out of ImageContainer.h, r=vlad
authorMichael Wu <mwu@mozilla.com>
Thu, 02 May 2013 12:56:09 -0400
changeset 141708 29e7839931715edf1ea9725038ed08893285802a
parent 141707 4e3ac5fbf0740de3648c8b9568a87580e8ee80fa
child 141709 1ae920a04d367fc1d59ff5c4efa7cd99ee767df8
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvlad
bugs868065
milestone23.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 868065 - Move GraphicBuffer.h include out of ImageContainer.h, r=vlad
content/media/omx/MediaOmxReader.h
gfx/layers/ImageContainer.h
--- a/content/media/omx/MediaOmxReader.h
+++ b/content/media/omx/MediaOmxReader.h
@@ -3,16 +3,17 @@
 /* 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/. */
 #if !defined(MediaOmxReader_h_)
 #define MediaOmxReader_h_
 
 #include "MediaResource.h"
 #include "MediaDecoderReader.h"
+#include <ui/GraphicBuffer.h>
 
 namespace android {
 class OmxDecoder;
 }
 
 namespace mozilla {
 
 namespace dom {
--- a/gfx/layers/ImageContainer.h
+++ b/gfx/layers/ImageContainer.h
@@ -15,20 +15,16 @@
 #include "nsTArray.h"
 
 #ifdef XP_WIN
 struct ID3D10Texture2D;
 struct ID3D10Device;
 struct ID3D10ShaderResourceView;
 #endif
 
-#ifdef MOZ_WIDGET_GONK
-# include <ui/GraphicBuffer.h>
-#endif
-
 typedef void* HANDLE;
 
 namespace mozilla {
 
 class CrossProcessMutex;
 namespace ipc {
 class Shmem;
 }