Changeset 122180 in webkit

Timestamp:

Jul 9, 2012 6:43:31 PM (12 years ago)

Author:

danakj@chromium.org

Message:

[chromium] Create CCScopedTexture class for creating/freeing textures
​https://bugs.webkit.org/show_bug.cgi?id=89485

Reviewed by Adrienne Walker.

Source/WebCore:

This class provides a standard way to create texture ids in a way that
ensures they will be freed later.

Also includes a CCTexture base class that holds textureId, size, and
format together in a struct that can be used in place of storing an
unsigned textureId in other classes.

Unit tests: CCScopedTexureTest.NewScopedTexture

CCScopedTexureTest.CreateScopedTexture
CCScopedTexureTest.ScopedTextureIsDeleted
CCScopedTexureTest.LoseScopedTexture

• WebCore.gypi:
• platform/graphics/chromium/cc/CCScopedTexture.cpp: Added.

(WebCore):
(WebCore::CCScopedTexture::CCScopedTexture):
(WebCore::CCScopedTexture::~CCScopedTexture):
(WebCore::CCScopedTexture::allocate):
(WebCore::CCScopedTexture::free):
(WebCore::CCScopedTexture::leak):

• platform/graphics/chromium/cc/CCScopedTexture.h: Added.

(WebCore):
(CCScopedTexture):
(WebCore::CCScopedTexture::create):

• platform/graphics/chromium/cc/CCTexture.cpp: Added.

(WebCore):
(WebCore::CCTexture::setDimensions):
(WebCore::CCTexture::bytes):
(WebCore::CCTexture::memorySizeBytes):

• platform/graphics/chromium/cc/CCTexture.h: Added.

(WebCore):
(CCTexture):
(WebCore::CCTexture::CCTexture):
(WebCore::CCTexture::id):
(WebCore::CCTexture::size):
(WebCore::CCTexture::format):
(WebCore::CCTexture::setId):

Source/WebKit/chromium:

• WebKit.gypi:
• tests/CCScopedTextureTest.cpp: Added.

(WebKitTests):
(WebKitTests::TEST):
(TrackingTextureAllocator):
(WebKitTests::TrackingTextureAllocator::TrackingTextureAllocator):
(WebKitTests::TrackingTextureAllocator::numTextures):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (2 diffs)
• WebCore/platform/graphics/chromium/cc/CCScopedTexture.cpp (added)
• WebCore/platform/graphics/chromium/cc/CCScopedTexture.h (added)
• WebCore/platform/graphics/chromium/cc/CCTexture.cpp (added)
• WebCore/platform/graphics/chromium/cc/CCTexture.h (added)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gypi (modified) (1 diff)
• WebKit/chromium/tests/CCScopedTextureTest.cpp (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-09  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Create CCScopedTexture class for creating/freeing textures
+        https://bugs.webkit.org/show_bug.cgi?id=89485
+
+        Reviewed by Adrienne Walker.
+
+        This class provides a standard way to create texture ids in a way that
+        ensures they will be freed later.
+
+        Also includes a CCTexture base class that holds textureId, size, and
+        format together in a struct that can be used in place of storing an
+        unsigned textureId in other classes.
+
+        Unit tests: CCScopedTexureTest.NewScopedTexture
+                    CCScopedTexureTest.CreateScopedTexture
+                    CCScopedTexureTest.ScopedTextureIsDeleted
+                    CCScopedTexureTest.LoseScopedTexture
+
+        * WebCore.gypi:
+        * platform/graphics/chromium/cc/CCScopedTexture.cpp: Added.
+        (WebCore):
+        (WebCore::CCScopedTexture::CCScopedTexture):
+        (WebCore::CCScopedTexture::~CCScopedTexture):
+        (WebCore::CCScopedTexture::allocate):
+        (WebCore::CCScopedTexture::free):
+        (WebCore::CCScopedTexture::leak):
+        * platform/graphics/chromium/cc/CCScopedTexture.h: Added.
+        (WebCore):
+        (CCScopedTexture):
+        (WebCore::CCScopedTexture::create):
+        * platform/graphics/chromium/cc/CCTexture.cpp: Added.
+        (WebCore):
+        (WebCore::CCTexture::setDimensions):
+        (WebCore::CCTexture::bytes):
+        (WebCore::CCTexture::memorySizeBytes):
+        * platform/graphics/chromium/cc/CCTexture.h: Added.
+        (WebCore):
+        (CCTexture):
+        (WebCore::CCTexture::CCTexture):
+        (WebCore::CCTexture::id):
+        (WebCore::CCTexture::size):
+        (WebCore::CCTexture::format):
+        (WebCore::CCTexture::setId):
+
 2012-07-09  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -8362 +8362 @@
             'platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp',
             'platform/graphics/chromium/cc/CCSchedulerStateMachine.h',
+            'platform/graphics/chromium/cc/CCScopedTexture.cpp',
+            'platform/graphics/chromium/cc/CCScopedTexture.h',
             'platform/graphics/chromium/cc/CCScopedThreadProxy.h',
             'platform/graphics/chromium/cc/CCScrollbarLayerImpl.cpp',
@@ -8377 +8379 @@
             'platform/graphics/chromium/cc/CCStreamVideoDrawQuad.cpp',
             'platform/graphics/chromium/cc/CCStreamVideoDrawQuad.h',
+            'platform/graphics/chromium/cc/CCTexture.cpp',
+            'platform/graphics/chromium/cc/CCTexture.h',
             'platform/graphics/chromium/cc/CCTextureDrawQuad.cpp',
             'platform/graphics/chromium/cc/CCTextureDrawQuad.h',

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-07-09  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Create CCScopedTexture class for creating/freeing textures
+        https://bugs.webkit.org/show_bug.cgi?id=89485
+
+        Reviewed by Adrienne Walker.
+
+        * WebKit.gypi:
+        * tests/CCScopedTextureTest.cpp: Added.
+        (WebKitTests):
+        (WebKitTests::TEST):
+        (TrackingTextureAllocator):
+        (WebKitTests::TrackingTextureAllocator::TrackingTextureAllocator):
+        (WebKitTests::TrackingTextureAllocator::numTextures):
+
 2012-07-09  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -87 +87 @@
             'tests/CCSchedulerTestCommon.h',
             'tests/CCSchedulerTest.cpp',
+            'tests/CCScopedTextureTest.cpp',
             'tests/CCSolidColorLayerImplTest.cpp',
             'tests/CCTestCommon.h',