Bug 804724 - Add an abort painting marker. r=ehsan

--HG--
extra : rebase_source : 10f327e91b15d673303eb607a361c1c4d14a1e92

gfx/layers/basic/BasicTiledThebesLayer.cpp

@@ -274,6 +274,7 @@ BasicTiledThebesLayer::ComputeProgressiveUpdateRegion(const nsIntRegion& aInvali
   gfx::Rect viewport;
   float scaleX, scaleY;
   if (BasicManager()->ProgressiveUpdateCallback(!freshRegion.IsEmpty(), viewport, scaleX, scaleY)) {
+    SAMPLE_MARKER("Abort painting");
     aRegionToPaint.SetEmpty();
     return aIsRepeated;
   }

tools/profiler/sps_sampler.h

@@ -424,6 +424,9 @@ inline void mozilla_sampler_call_exit(void *aHandle)
 
 inline void mozilla_sampler_add_marker(const char *aMarker)
 {
+  if (!stack_key_initialized)
+    return;
+
   ProfileStack *stack = tlsStack.get();
   if (!stack) {
     return;