Merge 136332

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 52 matching lines @@
         return m_context;
     }
 
     PassRefPtr<GraphicsContext3D> createContext()
     {
         GraphicsContext3D::Attributes attributes;
         attributes.depth = false;
         attributes.stencil = true;
         attributes.antialias = false;
         attributes.shareResources = true;
-        attributes.preferDiscreteGPU = true;
         m_context = GraphicsContext3D::create(attributes, 0);
         return m_context;
     }
 private:
     RefPtr<GraphicsContext3D> m_context;
 };
 
 PassRefPtr<GraphicsContext3D> SharedGraphicsContext3D::get()
 {
     DEFINE_STATIC_LOCAL(SharedGraphicsContext3DImpl, impl, ());
@@ skipping 23 matching lines @@
 }
 
 bool SharedGraphicsContext3D::createForImplThread()
 {
     ASSERT(isMainThread());
     return getOrCreateContextForImplThread(Create);
 }
 
 }