[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c
vangelis at chromium.org
vangelis at chromium.org
Mon Dec 27 16:30:31 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b981eec393d9d5b3877b86af10f7ee95381a45ce
Author: vangelis at chromium.org <vangelis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 22 18:36:04 2010 +0000
2010-12-21 Vangelis Kokkevis <vangelis at chromium.org>
Reviewed by Kenneth Russell.
[chromium] Fixing crash with empty render surfaces.
https://bugs.webkit.org/show_bug.cgi?id=51432
Test: platform/chromium/compositing/empty-render-surface-crasher.html
* platform/graphics/chromium/RenderSurfaceChromium.cpp:
(WebCore::RenderSurfaceChromium::draw):
2010-12-21 Vangelis Kokkevis <vangelis at chromium.org>
Reviewed by Kenneth Russell.
[chromium] Enabling layout tests in platform/chromium/compositing
and adding new layout test to check for crash on empty render surfaces.
https://bugs.webkit.org/show_bug.cgi?id=51432
* platform/chromium-gpu/test_expectations.txt:
* platform/chromium/compositing/empty-render-surface-crasher-expected.txt: Added.
* platform/chromium/compositing/empty-render-surface-crasher.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74484 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 677990e..49479d8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-21 Vangelis Kokkevis <vangelis at chromium.org>
+
+ Reviewed by Kenneth Russell.
+
+ [chromium] Enabling layout tests in platform/chromium/compositing
+ and adding new layout test to check for crash on empty render surfaces.
+ https://bugs.webkit.org/show_bug.cgi?id=51432
+
+ * platform/chromium-gpu/test_expectations.txt:
+ * platform/chromium/compositing/empty-render-surface-crasher-expected.txt: Added.
+ * platform/chromium/compositing/empty-render-surface-crasher.html: Added.
+
2010-12-22 Krithigassree Sambamurthy <krithigassree.sambamurthy at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/chromium-gpu/test_expectations.txt b/LayoutTests/platform/chromium-gpu/test_expectations.txt
index 4dea324..05f5704 100644
--- a/LayoutTests/platform/chromium-gpu/test_expectations.txt
+++ b/LayoutTests/platform/chromium-gpu/test_expectations.txt
@@ -50,6 +50,8 @@ WONTFIX SKIP : wml = PASS FAIL
// FIXME: remove the FAIL from the following line.
BUGNONE : compositing = PASS FAIL
+platform/chromium/compositing = PASS
+
// Unskip the canvas tests on Win and Linux only (since Mac does not support
// accelerated 2D canvas yet).
BUGNONE WIN LINUX : fast/canvas = PASS
diff --git a/LayoutTests/platform/chromium/compositing/empty-render-surface-crasher-expected.txt b/LayoutTests/platform/chromium/compositing/empty-render-surface-crasher-expected.txt
new file mode 100644
index 0000000..f8a2392
--- /dev/null
+++ b/LayoutTests/platform/chromium/compositing/empty-render-surface-crasher-expected.txt
@@ -0,0 +1,3 @@
+This page tests that an empty render surface does not crash as reported in this bug. Pass if this does not crash.
+
+
diff --git a/LayoutTests/platform/chromium/compositing/empty-render-surface-crasher.html b/LayoutTests/platform/chromium/compositing/empty-render-surface-crasher.html
new file mode 100644
index 0000000..d83a75f
--- /dev/null
+++ b/LayoutTests/platform/chromium/compositing/empty-render-surface-crasher.html
@@ -0,0 +1,34 @@
+<!DOCTYPE>
+<html>
+<head>
+<title>Empty Render Surface</title>
+ <style type="text/css" media="screen">
+ .container {
+ position: relative;
+ height: 0x;
+ width: 0px;
+ opacity:0.5;
+ }
+
+ .child {
+ -webkit-transform: translateZ(0);
+ height: 0px;
+ width: 0px;
+ background-color: red;
+ }
+ </style>
+ <script type="text/javascript" charset="utf-8">
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ </script>
+
+</head>
+<body>
+<p>This page tests that an empty render surface does not crash as reported in <a href='https://bugs.webkit.org/show_bug.cgi?id=51432'>this bug</a>. Pass if this does not crash.</p>
+
+<div class="container">
+ <div class="child"> </div>
+</div>
+
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dba5441..79ecb4b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-21 Vangelis Kokkevis <vangelis at chromium.org>
+
+ Reviewed by Kenneth Russell.
+
+ [chromium] Fixing crash with empty render surfaces.
+ https://bugs.webkit.org/show_bug.cgi?id=51432
+
+ Test: platform/chromium/compositing/empty-render-surface-crasher.html
+
+ * platform/graphics/chromium/RenderSurfaceChromium.cpp:
+ (WebCore::RenderSurfaceChromium::draw):
+
2010-12-21 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp b/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp
index e9fdf01..e8b9a12 100644
--- a/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp
+++ b/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp
@@ -135,7 +135,7 @@ bool RenderSurfaceChromium::prepareContentsTexture()
void RenderSurfaceChromium::draw()
{
- if (m_skipsDraw)
+ if (m_skipsDraw || !m_contentsTexture)
return;
m_contentsTexture->bindTexture();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list