Merge 125577 - [chromium] race between CCLayerTreeHostImpl::releaseContentsTextures and CCThreadPro…

Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateQueue.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
@@ skipping 36 matching lines @@
 void CCTextureUpdateQueue::appendPartialUpload(TextureUploader::Parameters upload)
 {
     m_partialEntries.append(upload);
 }
 
 void CCTextureUpdateQueue::appendCopy(TextureCopier::Parameters copy)
 {
     m_copyEntries.append(copy);
 }
 
+void CCTextureUpdateQueue::clearUploads()
+{
+    m_fullEntries.clear();
+    m_partialEntries.clear();
+}
+
 TextureUploader::Parameters CCTextureUpdateQueue::takeFirstFullUpload()
 {
     return m_fullEntries.takeFirst();
 }
 
 TextureUploader::Parameters CCTextureUpdateQueue::takeFirstPartialUpload()
 {
     return m_partialEntries.takeFirst();
 }
 
 TextureCopier::Parameters CCTextureUpdateQueue::takeFirstCopy()
 {
     return m_copyEntries.takeFirst();
 }
 
 bool CCTextureUpdateQueue::hasMoreUpdates() const
 {
     return m_fullEntries.size() || m_partialEntries.size() || m_copyEntries.size();
 }
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)