Backed out changeset 6e0fb526633d (bug 1577916) for build bustage at gfx/layers/composite/TextRenderer.cpp on a CLOSED TREE

gfx/layers/client/ContentClient.cpp

@@ -39,6 +39,8 @@
 #include <utility>
 #include <vector>
 
+using namespace std;
+
 namespace mozilla {
 
 using namespace gfx;
@@ -572,7 +574,7 @@ class RemoteBufferReadbackProcessor : public TextureReadbackSink {
  private:
   nsTArray<ReadbackProcessor::Update> mReadbackUpdates;
   // This array is used to keep the layers alive until the callback.
-  std::vector<RefPtr<Layer>> mLayerRefs;
+  vector<RefPtr<Layer>> mLayerRefs;
 
   IntRect mBufferRect;
   nsIntPoint mBufferRotation;

gfx/layers/composite/TextRenderer.cpp

@@ -17,6 +17,7 @@ namespace mozilla {
 namespace layers {
 
 using namespace gfx;
+using namespace std;
 
 const Float sBackgroundOpacity = 0.8f;
 const SurfaceFormat sTextureFormat = SurfaceFormat::B8G8R8A8;
@@ -50,7 +51,7 @@ TextRenderer::~TextRenderer() {}
 
 TextRenderer::FontCache::~FontCache() { mGlyphBitmaps->Unmap(); }
 
-void TextRenderer::RenderText(Compositor* aCompositor, const std::string& aText,
+void TextRenderer::RenderText(Compositor* aCompositor, const string& aText,
                               const IntPoint& aOrigin,
                               const Matrix4x4& aTransform, uint32_t aTextSize,
                               uint32_t aTargetPixelWidth, FontType aFontType) {
@@ -79,7 +80,7 @@ void TextRenderer::RenderText(Compositor* aCompositor, const std::string& aText,
   aCompositor->DrawQuad(Rect(drawRect), clip, chain, 1.0f, transform);
 }
 
-IntSize TextRenderer::ComputeSurfaceSize(const std::string& aText,
+IntSize TextRenderer::ComputeSurfaceSize(const string& aText,
                                          uint32_t aTargetPixelWidth,
                                          FontType aFontType) {
   if (!EnsureInitialized(aFontType)) {

gfx/layers/d3d11/MLGDeviceD3D11.cpp

@@ -30,6 +30,7 @@ namespace layers {
 using namespace mozilla::gfx;
 using namespace mozilla::widget;
 using namespace mozilla::layers::mlg;
+using namespace std;
 
 // Defined in CompositorD3D11.cpp.
 bool CanUsePartialPresents(ID3D11Device* aDevice);

gfx/layers/ipc/CompositorBridgeParent.cpp

@@ -114,6 +114,7 @@ namespace layers {
 
 using namespace mozilla::ipc;
 using namespace mozilla::gfx;
+using namespace std;
 
 using base::ProcessId;
 using base::Thread;
@@ -235,7 +236,7 @@ CompositorBridgeParent::LayerTreeState::~LayerTreeState() {
   }
 }
 
-typedef std::map<LayersId, CompositorBridgeParent::LayerTreeState> LayerTreeMap;
+typedef map<LayersId, CompositorBridgeParent::LayerTreeState> LayerTreeMap;
 LayerTreeMap sIndirectLayerTrees;
 StaticAutoPtr<mozilla::Monitor> sIndirectLayerTreesLock;
 
@@ -267,7 +268,7 @@ inline void CompositorBridgeParent::ForEachIndirectLayerTree(
  * compositions without having to keep references to the
  * compositor
  */
-typedef std::map<uint64_t, CompositorBridgeParent*> CompositorMap;
+typedef map<uint64_t, CompositorBridgeParent*> CompositorMap;
 static StaticAutoPtr<CompositorMap> sCompositorMap;
 
 void CompositorBridgeParent::Setup() {

gfx/layers/ipc/CompositorVsyncScheduler.cpp

@@ -42,6 +42,7 @@ namespace mozilla {
 namespace layers {
 
 using namespace mozilla::gfx;
+using namespace std;
 
 CompositorVsyncScheduler::Observer::Observer(CompositorVsyncScheduler* aOwner)
     : mMutex("CompositorVsyncScheduler.Observer.Mutex"), mOwner(aOwner) {}

gfx/layers/ipc/ContentCompositorBridgeParent.cpp

@@ -42,12 +42,14 @@
 #  include "ProfilerMarkerPayload.h"
 #endif
 
+using namespace std;
+
 namespace mozilla {
 
 namespace layers {
 
 // defined in CompositorBridgeParent.cpp
-typedef std::map<LayersId, CompositorBridgeParent::LayerTreeState> LayerTreeMap;
+typedef map<LayersId, CompositorBridgeParent::LayerTreeState> LayerTreeMap;
 extern LayerTreeMap sIndirectLayerTrees;
 extern StaticAutoPtr<mozilla::Monitor> sIndirectLayerTreesLock;
 void UpdateIndirectTree(LayersId aId, Layer* aRoot,

gfx/layers/mlgpu/LayerManagerMLGPU.cpp

@@ -32,6 +32,8 @@
 #  include "mozilla/gfx/DeviceManagerDx.h"
 #endif
 
+using namespace std;
+
 namespace mozilla {
 namespace layers {
 

gfx/layers/mlgpu/SharedBufferMLGPU.cpp

@@ -8,6 +8,8 @@
 #include "BufferCache.h"
 #include "MLGDevice.h"
 
+using namespace std;
+
 namespace mozilla {
 namespace layers {
 

gfx/layers/opengl/CompositorOGL.cpp

@@ -62,6 +62,7 @@
 
 namespace mozilla {
 
+using namespace std;
 using namespace gfx;
 
 namespace layers {

gfx/layers/opengl/OGLShaderProgram.cpp

@@ -7,7 +7,7 @@
 #include "OGLShaderProgram.h"
 
 #include <stdint.h>  // for uint32_t
-#include <sstream>   // for std::ostringstream
+#include <sstream>   // for ostringstream
 #include "gfxEnv.h"
 #include "gfxRect.h"  // for gfxRect
 #include "gfxUtils.h"
@@ -21,7 +21,7 @@
 namespace mozilla {
 namespace layers {
 
-using std::endl;
+using namespace std;
 
 #define GAUSSIAN_KERNEL_HALF_WIDTH 11
 #define GAUSSIAN_KERNEL_STEP 0.2
@@ -157,7 +157,7 @@ void ShaderConfigOGL::SetDynamicGeometry(bool aEnabled) {
 /* static */
 ProgramProfileOGL ProgramProfileOGL::GetProfileFor(ShaderConfigOGL aConfig) {
   ProgramProfileOGL result;
-  std::ostringstream fs, vs;
+  ostringstream fs, vs;
 
   AddUniforms(result);
 
@@ -854,7 +854,7 @@ bool ShaderProgramOGL::Initialize() {
   NS_ASSERTION(mProgramState == STATE_NEW,
                "Shader program has already been initialised");
 
-  std::ostringstream vs, fs;
+  ostringstream vs, fs;
   for (uint32_t i = 0; i < mProfile.mDefines.Length(); ++i) {
     vs << mProfile.mDefines[i] << endl;
     fs << mProfile.mDefines[i] << endl;