Changeset 122294 in webkit

Timestamp:

Jul 10, 2012 9:42:12 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Make full texture updates explicit
​https://bugs.webkit.org/show_bug.cgi?id=90507

Patch by Brian Anderson <​brianderson@chromium.org> on 2012-07-10
Reviewed by Adrienne Walker.

Covered by existing tests.

• platform/graphics/chromium/ScrollbarLayerChromium.cpp:

(WebCore::ScrollbarLayerChromium::updatePart):

• platform/graphics/chromium/TiledLayerChromium.cpp:

(WebCore::TiledLayerChromium::updateTiles):

• platform/graphics/chromium/cc/CCTextureUpdater.cpp:

(WebCore::CCTextureUpdater::appendFullUpdate):
(WebCore::CCTextureUpdater::hasMoreUpdates):
(WebCore::CCTextureUpdater::update):
(WebCore::CCTextureUpdater::clear):

• platform/graphics/chromium/cc/CCTextureUpdater.h:

(CCTextureUpdater):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/ScrollbarLayerChromium.cpp (modified) (1 diff)
• platform/graphics/chromium/TiledLayerChromium.cpp (modified) (1 diff)
• platform/graphics/chromium/cc/CCTextureUpdater.cpp (modified) (5 diffs)
• platform/graphics/chromium/cc/CCTextureUpdater.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-10  Brian Anderson  <brianderson@chromium.org>
+
+        [chromium] Make full texture updates explicit
+        https://bugs.webkit.org/show_bug.cgi?id=90507
+
+        Reviewed by Adrienne Walker.
+
+        Covered by existing tests.
+
+        * platform/graphics/chromium/ScrollbarLayerChromium.cpp:
+        (WebCore::ScrollbarLayerChromium::updatePart):
+        * platform/graphics/chromium/TiledLayerChromium.cpp:
+        (WebCore::TiledLayerChromium::updateTiles):
+        * platform/graphics/chromium/cc/CCTextureUpdater.cpp:
+        (WebCore::CCTextureUpdater::appendFullUpdate):
+        (WebCore::CCTextureUpdater::hasMoreUpdates):
+        (WebCore::CCTextureUpdater::update):
+        (WebCore::CCTextureUpdater::clear):
+        * platform/graphics/chromium/cc/CCTextureUpdater.h:
+        (CCTextureUpdater):
+
 2012-07-10  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/ScrollbarLayerChromium.cpp

@@ -248 +248 @@
 
     IntRect destRect(IntPoint(), rect.size());
-    updater.appendUpdate(texture, rect, destRect);
+    updater.appendFullUpdate(texture, rect, destRect);
 }
 

trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp

@@ -511 +511 @@
                 updater.appendPartialUpdate(tile->texture(), sourceRect, destRect);
             else
-                updater.appendUpdate(tile->texture(), sourceRect, destRect);
+                updater.appendFullUpdate(tile->texture(), sourceRect, destRect);
         }
     }

trunk/Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdater.cpp

@@ -60 +60 @@
 }
 
-void CCTextureUpdater::appendUpdate(LayerTextureUpdater::Texture* texture, const IntRect& sourceRect, const IntRect& destRect)
+void CCTextureUpdater::appendFullUpdate(LayerTextureUpdater::Texture* texture, const IntRect& sourceRect, const IntRect& destRect)
 {
-    appendUpdate(texture, sourceRect, destRect, m_entries);
+    appendUpdate(texture, sourceRect, destRect, m_fullEntries);
 }
 
@@ -81 +81 @@
 bool CCTextureUpdater::hasMoreUpdates() const
 {
-    return m_entries.size() || m_partialEntries.size() || m_copyEntries.size();
+    return m_fullEntries.size() || m_partialEntries.size() || m_copyEntries.size();
 }
 
@@ -88 +88 @@
     size_t index;
 
-    if (m_entries.size() || m_partialEntries.size()) {
+    if (m_fullEntries.size() || m_partialEntries.size()) {
         if (uploader->isBusy())
             return;
@@ -94 +94 @@
         uploader->beginUploads();
 
-        size_t maxIndex = min(m_entryIndex + count, m_entries.size());
+        size_t maxIndex = min(m_entryIndex + count, m_fullEntries.size());
         for (index = m_entryIndex; index < maxIndex; ++index) {
-            UpdateEntry& entry = m_entries[index];
+            UpdateEntry& entry = m_fullEntries[index];
             uploader->uploadTexture(context, entry.texture, allocator, entry.sourceRect, entry.destRect);
         }
 
-        bool moreUploads = maxIndex < m_entries.size();
+        bool moreUploads = maxIndex < m_fullEntries.size();
 
         ASSERT(m_partialEntries.size() <= count);
@@ -144 +144 @@
 {
     m_entryIndex = 0;
-    m_entries.clear();
+    m_fullEntries.clear();
     m_partialEntries.clear();
     m_copyEntries.clear();

trunk/Source/WebCore/platform/graphics/chromium/cc/CCTextureUpdater.h

@@ -42 +42 @@
     ~CCTextureUpdater();
 
-    void appendUpdate(LayerTextureUpdater::Texture*, const IntRect& sourceRect, const IntRect& destRect);
+    void appendFullUpdate(LayerTextureUpdater::Texture*, const IntRect& sourceRect, const IntRect& destRect);
     void appendPartialUpdate(LayerTextureUpdater::Texture*, const IntRect& sourceRect, const IntRect& destRect);
     void appendCopy(unsigned sourceTexture, unsigned destTexture, const IntSize&);
@@ -69 +69 @@
 
     size_t m_entryIndex;
-    Vector<UpdateEntry> m_entries;
+    Vector<UpdateEntry> m_fullEntries;
     Vector<UpdateEntry> m_partialEntries;
     Vector<CopyEntry> m_copyEntries;