Title: [205053] trunk/Source/WebCore
- Revision
- 205053
- Author
- akl...@apple.com
- Date
- 2016-08-26 15:41:41 -0700 (Fri, 26 Aug 2016)
Log Message
REGRESSION (r204987): fast/canvas-composite-* tests are now flaky assertion failures
<https://webkit.org/b/161259>
Reviewed by Joseph Pecoraro.
Fix a blunder where HTMLCanvasElement::memoryCost() wasn't forwarding the inquiry
to ImageBuffer but HTMLCanvasElement::externalMemoryCost() was.
This fixes flaky "externalMemorySize() <= extraMemorySize()" assertions on debug bots.
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::memoryCost):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (205052 => 205053)
--- trunk/Source/WebCore/ChangeLog 2016-08-26 22:16:36 UTC (rev 205052)
+++ trunk/Source/WebCore/ChangeLog 2016-08-26 22:41:41 UTC (rev 205053)
@@ -1,5 +1,20 @@
2016-08-26 Andreas Kling <akl...@apple.com>
+ REGRESSION (r204987): fast/canvas-composite-* tests are now flaky assertion failures
+ <https://webkit.org/b/161259>
+
+ Reviewed by Joseph Pecoraro.
+
+ Fix a blunder where HTMLCanvasElement::memoryCost() wasn't forwarding the inquiry
+ to ImageBuffer but HTMLCanvasElement::externalMemoryCost() was.
+
+ This fixes flaky "externalMemorySize() <= extraMemorySize()" assertions on debug bots.
+
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::memoryCost):
+
+2016-08-26 Andreas Kling <akl...@apple.com>
+
The :enabled/:disabled selectors should only match elements that can be disabled.
<https://webkit.org/b/161255>
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (205052 => 205053)
--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2016-08-26 22:16:36 UTC (rev 205052)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2016-08-26 22:41:41 UTC (rev 205053)
@@ -575,7 +575,7 @@
{
if (!m_imageBuffer)
return 0;
- return 4 * m_imageBuffer->internalSize().width() * m_imageBuffer->internalSize().height();
+ return m_imageBuffer->memoryCost();
}
size_t HTMLCanvasElement::externalMemoryCost() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
