Rolls cc and webkit_compositor up to 127340

cc/CCSingleThreadProxy.h

Index: cc/CCSingleThreadProxy.h
diff --git a/cc/CCSingleThreadProxy.h b/cc/CCSingleThreadProxy.h
index 37a970c3b3f7ddf62ff281bca000ba944589a48e..02981d1026c8717836802ed4aca9c1a6af5f15e5 100644
--- a/cc/CCSingleThreadProxy.h
+++ b/cc/CCSingleThreadProxy.h
@@ -82,7 +82,7 @@ private:
 };
 
 // For use in the single-threaded case. In debug builds, it pretends that the
-// code is running on the thread to satisfy assertion checks.
+// code is running on the impl thread to satisfy assertion checks.
 class DebugScopedSetImplThread {
 public:
     DebugScopedSetImplThread()
@@ -117,6 +117,15 @@ public:
     }
 };
 
+// For use in the single-threaded case. In debug builds, it pretends that the
+// code is running on the impl thread and that the main thread is blocked to
+// satisfy assertion checks
+class DebugScopedSetImplThreadAndMainThreadBlocked {
+private:
+    DebugScopedSetImplThread m_implThread;
+    DebugScopedSetMainThreadBlocked m_mainThreadBlocked;
+};
+
 } // namespace WebCore
 
 #endif