Merge 135809 - [Chromium] Shared graphics context should only pushGroupMarker() once

Source/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 24 matching lines @@
 
 class SharedGraphicsContext3DImpl {
 public:
     SharedGraphicsContext3DImpl() : m_context(0) { }
     PassRefPtr<GraphicsContext3D> getOrCreateContext()
     {
         // If we lost the context, or can't make it current, create a new one.
         if (m_context && (!m_context->makeContextCurrent() || (m_context->getExtensions()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR)))
             m_context.clear();
 
-        if (!m_context)
+        bool wasCreated = false;
+
+        if (!m_context) {
             createContext();
+            wasCreated = true;
+        }
 
         if (m_context && !m_context->makeContextCurrent())
             m_context.clear();
 
+        if (m_context && wasCreated)
+            m_context->getExtensions()->pushGroupMarkerEXT("SharedGraphicsContext");
+
         return m_context;
     }
 
     PassRefPtr<GraphicsContext3D> getContext()
     {
         return m_context;
     }
 
     PassRefPtr<GraphicsContext3D> createContext()
     {
@@ skipping 39 matching lines @@
 }
 
 bool SharedGraphicsContext3D::createForImplThread()
 {
     ASSERT(isMainThread());
     return getOrCreateContextForImplThread(Create);
 }
 
 }