Changeset 146082 in webkit

Timestamp:

Mar 18, 2013 10:34:37 AM (11 years ago)

Author:

Simon Fraser

Message:

[Mac] Some tests intermittently asserts in SharedBuffer::releasePurgeableBuffer()
​https://bugs.webkit.org/show_bug.cgi?id=105986

Source/WebCore:

Reviewed by Brady Eidson.

A ResourceBuffer's SharedBuffer can be vended out to other clients,
for example Images, so there's no guarantee that when the
ResourceBuffer only has one ref its SharedBuffer will also have just one.
When this assumption was broken, SharedBuffer::releasePurgeableBuffer()
would assert.

Ideally SharedBuffer would be entirely encapsulated by ResourceBuffer to
avoid this problem, but ResourceBuffer can't be used by code in platform/.

Fix by having ResourceBuffer::createPurgeableBuffer() refuse to make
a purgeable buffer if the sharedBuffer has more than one ref.

Tested by existing tests.

• loader/ResourceBuffer.cpp:

(WebCore::ResourceBuffer::createPurgeableBuffer):

LayoutTests:

Reviewed by Brady Eidson.

Remove expected Crashes for tests which should be fixed by this change.

• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/ResourceBuffer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-18  Simon Fraser  <simon.fraser@apple.com>
+
+        [Mac] Some tests intermittently asserts in SharedBuffer::releasePurgeableBuffer()
+        https://bugs.webkit.org/show_bug.cgi?id=105986
+
+        Reviewed by Brady Eidson.
+        
+        Remove expected Crashes for tests which should be fixed by this change.
+
+        * platform/mac/TestExpectations:
+
 2013-03-18  Kenneth Russell  <kbr@google.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1375 +1375 @@
 webkit.org/b/105777 platform/mac/editing/spelling/autocorrection-in-textarea.html [ Failure Pass ]
 
-webkit.org/b/105986 [ Debug ] transitions/hang-with-bad-transition-list.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] svg/dynamic-updates/SVGFEMorphologyElement-dom-in-attr.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] svg/dynamic-updates/SVGFEMorphologyElement-dom-radius-attr.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] svg/dynamic-updates/SVGFEMorphologyElement-dom-operator-attr.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] svg/dynamic-updates/SVGFEMergeNodeElement-dom-in-attr.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] transitions/interrupt-transform-transition.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] transitions/inherit-other-props.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] fast/backgrounds/size/parsing-background-size-values.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] transitions/flex-transitions.html [ Pass Crash ]
-webkit.org/b/105986 [ Debug ] transitions/interrupt-transform-transition.html [ Pass Crash ]
-
 webkit.org/b/105999 [ Lion ] fast/canvas/canvas-composite-canvas.html [ Failure ]
 webkit.org/b/105999 [ Lion ] fast/canvas/canvas-composite-image.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-18  Simon Fraser  <simon.fraser@apple.com>
+
+        [Mac] Some tests intermittently asserts in SharedBuffer::releasePurgeableBuffer()
+        https://bugs.webkit.org/show_bug.cgi?id=105986
+
+        Reviewed by Brady Eidson.
+        
+        A ResourceBuffer's SharedBuffer can be vended out to other clients,
+        for example Images, so there's no guarantee that when the
+        ResourceBuffer only has one ref its SharedBuffer will also have just one.
+        When this assumption was broken, SharedBuffer::releasePurgeableBuffer()
+        would assert.
+        
+        Ideally SharedBuffer would be entirely encapsulated by ResourceBuffer to
+        avoid this problem, but ResourceBuffer can't be used by code in platform/.
+        
+        Fix by having ResourceBuffer::createPurgeableBuffer() refuse to make
+        a purgeable buffer if the sharedBuffer has more than one ref.
+
+        Tested by existing tests.
+
+        * loader/ResourceBuffer.cpp:
+        (WebCore::ResourceBuffer::createPurgeableBuffer):
+
 2013-03-18  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/loader/ResourceBuffer.cpp

@@ -117 +117 @@
 {
     ASSERT(m_sharedBuffer);
+    if (!sharedBuffer()->hasOneRef())
+        return;
     sharedBuffer()->createPurgeableBuffer();
 }