Integrate r128344 and r128253 from WebKit

cc/CCPrioritizedTexture.h

 // Copyright 2012 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 CCPrioritizedTexture_h
 #define CCPrioritizedTexture_h
 
 #include "CCPriorityCalculator.h"
 #include "CCResourceProvider.h"
 #include "CCTexture.h"
@@ skipping 62 matching lines @@
     // Self-managed textures are accounted for when prioritizing other textures,
     // but they are not allocated/recycled/deleted, so this needs to be done
     // externally. canAcquireBackingTexture() indicates if the texture would have
     // been allowed given its priority.
     void setIsSelfManaged(bool isSelfManaged) { m_isSelfManaged = isSelfManaged; }
     bool isSelfManaged() { return m_isSelfManaged; }
     void setToSelfManagedMemoryPlaceholder(size_t bytes);
 
 private:
     friend class CCPrioritizedTextureManager;
+    friend class CCPrioritizedTextureTest;
 
     class Backing : public CCTexture {
         WTF_MAKE_NONCOPYABLE(Backing);
     public:
-        Backing(unsigned id, IntSize size, GC3Denum format)
-            : CCTexture(id, size, format), m_owner(0) { }
-        ~Backing() { ASSERT(!m_owner); }
+        Backing(unsigned id, IntSize, GC3Denum format);
+        ~Backing();
+        void updatePriority();
 
         CCPrioritizedTexture* owner() { return m_owner; }
+        bool hadOwnerAtLastPriorityUpdate() const { return m_ownerExistedAtLastPriorityUpdate; }
+        bool requestPriorityAtLastPriorityUpdate() const { return m_priorityAtLastPriorityUpdate; }
+        bool wasAbovePriorityCutoffAtLastPriorityUpdate() const { return m_wasAbovePriorityCutoffAtLastPriorityUpdate; }
+
     private:
         friend class CCPrioritizedTexture;
         CCPrioritizedTexture* m_owner;
+        int m_priorityAtLastPriorityUpdate;
+        bool m_ownerExistedAtLastPriorityUpdate;
+        bool m_wasAbovePriorityCutoffAtLastPriorityUpdate;
     };
 
     CCPrioritizedTexture(CCPrioritizedTextureManager*, IntSize, GC3Denum format);
 
     bool isAbovePriorityCutoff() { return m_isAbovePriorityCutoff; }
     void setAbovePriorityCutoff(bool isAbovePriorityCutoff) { m_isAbovePriorityCutoff = isAbovePriorityCutoff; }
     void setManagerInternal(CCPrioritizedTextureManager* manager) { m_manager = manager; }
 
     Backing* backing() const { return m_backing; }
     void link(Backing*);
     void unlink();
 
     IntSize m_size;
     GC3Denum m_format;
     size_t m_bytes;
 
     int m_priority;
     bool m_isAbovePriorityCutoff;
     bool m_isSelfManaged;
 
     Backing* m_backing;
     CCPrioritizedTextureManager* m_manager;
 };
 
 } // namespace cc
 
 #endif