Merge 113677 - [chromium] Viewport is not filled when out of texture memory on mac

Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp

 /*
  * Copyright (C) 2012 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 35 matching lines @@
 #define EXPECT_EQ_RECT(a, b) \
     EXPECT_EQ(a.x(), b.x()); \
     EXPECT_EQ(a.y(), b.y()); \
     EXPECT_EQ(a.width(), b.width()); \
     EXPECT_EQ(a.height(), b.height());
 
 namespace {
 
 class TestContentLayerChromium : public LayerChromium {
 public:
-    TestContentLayerChromium() : LayerChromium() { }
+    TestContentLayerChromium()
+        : LayerChromium()
+        , m_overrideOpaqueContentsRect(false)
+    {
+    }
 
     virtual bool drawsContent() const { return true; }
-    virtual Region visibleContentOpaqueRegion() const { return intersection(m_opaqueContentsRect, visibleLayerRect()); }
-    void setOpaqueContentsRect(const IntRect& opaqueContentsRect) { m_opaqueContentsRect = opaqueContentsRect; }
+    virtual Region visibleContentOpaqueRegion() const
+    {
+        if (m_overrideOpaqueContentsRect)
+            return intersection(m_opaqueContentsRect, visibleLayerRect());
+        return LayerChromium::visibleContentOpaqueRegion();
+    }
+    void setOpaqueContentsRect(const IntRect& opaqueContentsRect)
+    {
+        m_overrideOpaqueContentsRect = true;
+        m_opaqueContentsRect = opaqueContentsRect;
+    }
 
 private:
+    bool m_overrideOpaqueContentsRect;
     IntRect m_opaqueContentsRect;
 };
 
 class TestContentLayerImpl : public CCLayerImpl {
 public:
-    TestContentLayerImpl(int id) : CCLayerImpl(id) { setDrawsContent(true); }
+    TestContentLayerImpl(int id)
+        : CCLayerImpl(id)
+        , m_overrideOpaqueContentsRect(false)
+    {
+        setDrawsContent(true);
+    }
 
-    virtual Region visibleContentOpaqueRegion() const { return intersection(m_opaqueContentsRect, visibleLayerRect()); }
-    void setOpaqueContentsRect(const IntRect& opaqueContentsRect) { m_opaqueContentsRect = opaqueContentsRect; }
+    virtual Region visibleContentOpaqueRegion() const
+    {
+        if (m_overrideOpaqueContentsRect)
+            return intersection(m_opaqueContentsRect, visibleLayerRect());
+        return CCLayerImpl::visibleContentOpaqueRegion();
+    }
+    void setOpaqueContentsRect(const IntRect& opaqueContentsRect)
+    {
+        m_overrideOpaqueContentsRect = true;
+        m_opaqueContentsRect = opaqueContentsRect;
+    }
+
 private:
+    bool m_overrideOpaqueContentsRect;
     IntRect m_opaqueContentsRect;
 };
 
 // A subclass to expose the total current occlusion.
 template<typename LayerType, typename RenderSurfaceType>
 class TestCCOcclusionTrackerBase : public CCOcclusionTrackerBase<LayerType, RenderSurfaceType> {
 public:
     TestCCOcclusionTrackerBase(IntRect screenScissorRect, bool recordMetricsForFrame = false)
         : CCOcclusionTrackerBase<LayerType, RenderSurfaceType>(screenScissorRect, recordMetricsForFrame)
         , m_overrideLayerScissorRect(false)
@@ skipping 1831 matching lines @@
         EXPECT_EQ_RECT(IntRect(0, 0, 300, 200), occlusion.occlusionInScreenSpace().bounds());
         EXPECT_EQ(1u, occlusion.occlusionInScreenSpace().rects().size());
         EXPECT_EQ_RECT(IntRect(0, 0, 300, 200), occlusion.occlusionInTargetSurface().bounds());
         EXPECT_EQ(1u, occlusion.occlusionInTargetSurface().rects().size());
     }
 };
 
 MAIN_AND_IMPL_THREAD_TEST(CCOcclusionTrackerTestSurfaceOcclusionTranslatesWithClipping);
 
 } // namespace