Merge 88496 - 2011-06-09 James Robinson <jamesr@chromium.org>

Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp

 /*
  * Copyright (C) 2010 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 134 matching lines @@
     // FIXME: By using the same RenderSurface for both the content and its reflection,
     // it's currently not possible to apply a separate mask to the reflection layer
     // or correctly handle opacity in reflections (opacity must be applied after drawing
     // both the layer and its reflection). The solution is to introduce yet another RenderSurface
     // to draw the layer and its reflection in. For now we only apply a separate reflection
     // mask if the contents don't have a mask of their own.
     CCLayerImpl* replicaMaskLayer = m_maskLayer;
     if (!m_maskLayer && m_owningLayer->replicaLayer())
         replicaMaskLayer = m_owningLayer->replicaLayer()->maskLayer();
 
-    layerRenderer()->setScissorToRect(m_scissorRect);
+    if (m_owningLayer->parent() && m_owningLayer->parent()->usesLayerScissor())
+        layerRenderer()->setScissorToRect(m_scissorRect);
+    else
+        GLC(layerRenderer()->context(), layerRenderer()->context()->disable(GraphicsContext3D::SCISSOR_TEST));
+
 
     // Reflection draws before the layer.
     if (m_owningLayer->replicaLayer()) 
         drawSurface(replicaMaskLayer, m_replicaDrawTransform);
 
     drawSurface(m_maskLayer, m_drawTransform);
 }
 
 String RenderSurfaceChromium::name() const
 {
@@ skipping 10 matching lines @@
 {
     writeIndent(ts, indent);
     ts << name() << "\n";
 
     writeIndent(ts, indent+1);
     ts << "contentRect: (" << m_contentRect.x() << ", " << m_contentRect.y() << ", " << m_contentRect.width() << ", " << m_contentRect.height() << "\n";
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)