Integrate r128344 and r128253 from WebKit

cc/CCSingleThreadProxy.h

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CCSingleThreadProxy_h
 #define CCSingleThreadProxy_h
 
 #include "CCAnimationEvents.h"
 #include "CCLayerTreeHostImpl.h"
 #include "CCProxy.h"
@@ skipping 34 matching lines @@
     virtual void forceSerializeOnSwapBuffers() OVERRIDE;
 
     // CCLayerTreeHostImplClient implementation
     virtual void didLoseContextOnImplThread() OVERRIDE { }
     virtual void onSwapBuffersCompleteOnImplThread() OVERRIDE { ASSERT_NOT_REACHED(); }
     virtual void onVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds) OVERRIDE { }
     virtual void onCanDrawStateChanged(bool canDraw) OVERRIDE { }
     virtual void setNeedsRedrawOnImplThread() OVERRIDE { m_layerTreeHost->scheduleComposite(); }
     virtual void setNeedsCommitOnImplThread() OVERRIDE { m_layerTreeHost->scheduleComposite(); }
     virtual void postAnimationEventsToMainThreadOnImplThread(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime) OVERRIDE;
+    virtual void releaseContentsTexturesOnImplThread() OVERRIDE;
 
     // Called by the legacy path where RenderWidget does the scheduling.
     void compositeImmediately();
 
 private:
     explicit CCSingleThreadProxy(CCLayerTreeHost*);
 
     bool commitAndComposite();
     void doCommit(CCTextureUpdateQueue&);
     bool doComposite();
@@ skipping 56 matching lines @@
 // satisfy assertion checks
 class DebugScopedSetImplThreadAndMainThreadBlocked {
 private:
     DebugScopedSetImplThread m_implThread;
     DebugScopedSetMainThreadBlocked m_mainThreadBlocked;
 };
 
 } // namespace cc
 
 #endif