back out 621cfd13ceaf for build failures

This commit is contained in:
Benoit Jacob 2012-10-15 13:34:42 -04:00
parent 55205d9eef
commit 15decb515e
4 changed files with 5 additions and 6 deletions

View File

@ -11,6 +11,7 @@
#include "PathSkia.h"
#include <sstream>
#include <vector>
using namespace std;
namespace mozilla {
namespace gfx {
@ -104,7 +105,7 @@ private:
SkBitmap mBitmap;
SkRefPtr<SkCanvas> mCanvas;
SkRefPtr<SkDevice> mDevice;
std::vector<SourceSurfaceSkia*> mSnapshots;
vector<SourceSurfaceSkia*> mSnapshots;
};
}

View File

@ -14,7 +14,6 @@
#include "nsXULAppAPI.h"
using namespace mozilla::gfx;
using namespace mozilla::gl;
namespace mozilla {
namespace layers {

View File

@ -14,8 +14,6 @@
#include "mozilla/X11Util.h"
#include "cairo-xlib.h"
using namespace mozilla::gl;
namespace mozilla {
namespace layers {

View File

@ -23,6 +23,7 @@ namespace gl {
class GLContext;
class TextureImage;
}
using namespace gl;
namespace layers {
@ -415,8 +416,8 @@ public:
* underlying surface supports direct texturing, a non-null
* TextureImage is returned. Otherwise null is returned.
*/
static already_AddRefed<gl::TextureImage>
OpenDescriptorForDirectTexturing(gl::GLContext* aContext,
static already_AddRefed<TextureImage>
OpenDescriptorForDirectTexturing(GLContext* aContext,
const SurfaceDescriptor& aDescriptor,
GLenum aWrapMode);