[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 13:46:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 08b6c5ff50cdf3392747ebaacca3ebbc8d465c02
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Sep 26 19:21:48 2010 +0000
2010-09-26 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r68343.
http://trac.webkit.org/changeset/68343
https://bugs.webkit.org/show_bug.cgi?id=46581
broke GTK+ (Requested by kling on #webkit).
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::setFont):
2010-09-26 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r68343.
http://trac.webkit.org/changeset/68343
https://bugs.webkit.org/show_bug.cgi?id=46581
broke GTK+ (Requested by kling on #webkit).
* fast/canvas/canvas-font-ex-units-crash-expected.txt: Removed.
* fast/canvas/canvas-font-ex-units-crash.html: Removed.
* fast/canvas/script-tests/canvas-font-ex-units-crash.js: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68346 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5faad7c..849a2ea 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-26 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r68343.
+ http://trac.webkit.org/changeset/68343
+ https://bugs.webkit.org/show_bug.cgi?id=46581
+
+ broke GTK+ (Requested by kling on #webkit).
+
+ * fast/canvas/canvas-font-ex-units-crash-expected.txt: Removed.
+ * fast/canvas/canvas-font-ex-units-crash.html: Removed.
+ * fast/canvas/script-tests/canvas-font-ex-units-crash.js: Removed.
+
2010-09-25 Antonio Gomes <agomes at rim.com>
Reviewed by Kenneth Christiansen and Andreas Kling.
diff --git a/LayoutTests/fast/canvas/canvas-font-ex-units-crash-expected.txt b/LayoutTests/fast/canvas/canvas-font-ex-units-crash-expected.txt
deleted file mode 100644
index 48309f4..0000000
--- a/LayoutTests/fast/canvas/canvas-font-ex-units-crash-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Test that setting a font with size in 'ex' units doesn't crash.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS ctx.font = '5ex sans-serif'; ctx.font is '5ex sans-serif'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/canvas/canvas-font-ex-units-crash.html b/LayoutTests/fast/canvas/canvas-font-ex-units-crash.html
deleted file mode 100644
index 91f9215..0000000
--- a/LayoutTests/fast/canvas/canvas-font-ex-units-crash.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../js/resources/js-test-style.css">
-<script src="../js/resources/js-test-pre.js"></script>
-</head>
-<body>
-<p id="description"></p>
-<div id="console"></div>
-<script src="script-tests/canvas-font-ex-units-crash.js"></script>
-<script src="../js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js b/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js
deleted file mode 100644
index 52018ed..0000000
--- a/LayoutTests/fast/canvas/script-tests/canvas-font-ex-units-crash.js
+++ /dev/null
@@ -1,8 +0,0 @@
-description("Test that setting a font with size in 'ex' units doesn't crash.");
-
-ctx = document.createElement('canvas').getContext('2d');
-
-ctx.font = "5ex sans-serif";
-shouldBe("ctx.font = '5ex sans-serif'; ctx.font", "'5ex sans-serif'");
-
-var successfullyParsed = true;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f57f854..bfdc733 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-26 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r68343.
+ http://trac.webkit.org/changeset/68343
+ https://bugs.webkit.org/show_bug.cgi?id=46581
+
+ broke GTK+ (Requested by kling on #webkit).
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::setFont):
+
2010-09-25 Antonio Gomes <agomes at rim.com>
Reviewed by Kenneth Christiansen and Andreas Kling.
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index ab2d3ba..134ab67 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -1690,10 +1690,8 @@ void CanvasRenderingContext2D::setFont(const String& newFont)
// Map the <canvas> font into the text style. If the font uses keywords like larger/smaller, these will work
// relative to the canvas.
RefPtr<RenderStyle> newStyle = RenderStyle::create();
- if (RenderStyle* computedStyle = canvas()->computedStyle()) {
+ if (RenderStyle* computedStyle = canvas()->computedStyle())
newStyle->setFontDescription(computedStyle->fontDescription());
- newStyle->font().update(newStyle->font().fontSelector());
- }
// Now map the font property into the style.
CSSStyleSelector* styleSelector = canvas()->styleSelector();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list