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

Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdateQueue.h

 /*
  * 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 25 matching lines @@
 class CCTextureUpdateQueue {
     WTF_MAKE_NONCOPYABLE(CCTextureUpdateQueue);
 public:
     CCTextureUpdateQueue();
     virtual ~CCTextureUpdateQueue();
 
     void appendFullUpload(TextureUploader::Parameters);
     void appendPartialUpload(TextureUploader::Parameters);
     void appendCopy(TextureCopier::Parameters);
 
+    void clearUploads();
+
     TextureUploader::Parameters takeFirstFullUpload();
     TextureUploader::Parameters takeFirstPartialUpload();
     TextureCopier::Parameters takeFirstCopy();
 
     size_t fullUploadSize() const { return m_fullEntries.size(); }
     size_t partialUploadSize() const { return m_partialEntries.size(); }
     size_t copySize() const { return m_copyEntries.size(); }
 
     bool hasMoreUpdates() const;
 
 private:
     Deque<TextureUploader::Parameters> m_fullEntries;
     Deque<TextureUploader::Parameters> m_partialEntries;
     Deque<TextureCopier::Parameters> m_copyEntries;
 };
 
 }
 
 #endif // CCTextureUpdateQueue_h