[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

Thu Apr 8 02:24:28 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 3449c253d92bc08589cdcd61b7683e526116f46d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 23 17:10:40 2010 +0000

    2010-03-23  MORITA Hajime  <morrita at google.com>
    
            Reviewed by Alexey Proskuryakov.
    
            WebCore::SelectionController::setSelection NULL pointer
            https://bugs.webkit.org/show_bug.cgi?id=31545
    
            * svg/dom/frame-related-api-during-load-expected.txt: Added.
            * svg/dom/frame-related-api-during-load.html: Added.
    2010-03-23  MORITA Hajime  <morrita at google.com>
    
            Reviewed by Alexey Proskuryakov.
    
            WebCore::SelectionController::setSelection NULL pointer
            https://bugs.webkit.org/show_bug.cgi?id=31545
    
            Added missing NULL-check that other APIs have.
    
            Test: svg/dom/frame-related-api-during-load.html
    
            * svg/SVGSVGElement.cpp:
            (WebCore::SVGSVGElement::deselectAll):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56401 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fe187a6..6f5e387 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-23  MORITA Hajime  <morrita at google.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        WebCore::SelectionController::setSelection NULL pointer
+        https://bugs.webkit.org/show_bug.cgi?id=31545
+
+        * svg/dom/frame-related-api-during-load-expected.txt: Added.
+        * svg/dom/frame-related-api-during-load.html: Added.
+
 2010-03-19  Abhishek Arya  <inferno at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/svg/dom/frame-related-api-during-load-expected.txt b/LayoutTests/svg/dom/frame-related-api-during-load-expected.txt
new file mode 100644
index 0000000..a5b490e
--- /dev/null
+++ b/LayoutTests/svg/dom/frame-related-api-during-load-expected.txt
@@ -0,0 +1 @@
+OK unless it got crashed.
diff --git a/LayoutTests/svg/dom/frame-related-api-during-load.html b/LayoutTests/svg/dom/frame-related-api-during-load.html
new file mode 100644
index 0000000..429c433
--- /dev/null
+++ b/LayoutTests/svg/dom/frame-related-api-during-load.html
@@ -0,0 +1,22 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController)
+     layoutTestController.dumpAsText();
+
+function test()
+{
+    html_document = document.implementation.createHTMLDocument();
+    svg_element = html_document.createElementNS("http://www.w3.org/2000/svg","svg");
+    // Implementations of following APIs access Frame object, which can be NULL.
+    svg_element.deselectAll();
+    svg_element.currentScale = svg_element.currentScale;
+
+    document.getElementById("console").innerHTML = "OK unless it got crashed.";
+}
+</script>
+</head>
+<body onload="test()">
+<div id="console"></div>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cb00ad8..948d2bf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-23  MORITA Hajime  <morrita at google.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        WebCore::SelectionController::setSelection NULL pointer
+        https://bugs.webkit.org/show_bug.cgi?id=31545
+
+        Added missing NULL-check that other APIs have.
+
+        Test: svg/dom/frame-related-api-during-load.html
+
+        * svg/SVGSVGElement.cpp:
+        (WebCore::SVGSVGElement::deselectAll):
+
 2010-03-23  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Holger Freyther.
diff --git a/WebCore/svg/SVGSVGElement.cpp b/WebCore/svg/SVGSVGElement.cpp
index 7a6db84..4c06008 100644
--- a/WebCore/svg/SVGSVGElement.cpp
+++ b/WebCore/svg/SVGSVGElement.cpp
@@ -394,7 +394,8 @@ bool SVGSVGElement::checkEnclosure(SVGElement*, const FloatRect& rect)
 
 void SVGSVGElement::deselectAll()
 {
-    document()->frame()->selection()->clear();
+    if (Frame* frame = document()->frame())
+        frame->selection()->clear();
 }
 
 float SVGSVGElement::createSVGNumber()

-- 
WebKit Debian packaging

