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

Thu Apr 8 02:18:07 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit 98c1b874c5e2041e41d00f703b78ad0ce6d56482
Author: darin at chromium.org <darin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 22:37:04 2010 +0000

    2010-03-09  Anton Muhin  <antonm at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Accept and bailout NULL widgets in ChromiumBridge
            https://bugs.webkit.org/show_bug.cgi?id=35796
    
            * src/ChromiumBridge.cpp:
            (WebCore::toChromeClientImpl):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55748 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2c1b616..374d593 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-09  Anton Muhin  <antonm at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Accept and bailout NULL widgets in ChromiumBridge
+        https://bugs.webkit.org/show_bug.cgi?id=35796
+
+        * fast/frames/iframe-access-screen-of-deleted-expected.txt: Added.
+        * fast/frames/iframe-access-screen-of-deleted.html: Added.
+
 2010-03-09  Gustavo Noronha Silva  <gns at gnome.org>
 
         [GTK] Fails http/tests/plugins/third-party-cookie-accept-policy.html
diff --git a/LayoutTests/fast/frames/iframe-access-screen-of-deleted-expected.txt b/LayoutTests/fast/frames/iframe-access-screen-of-deleted-expected.txt
new file mode 100644
index 0000000..cbfdde0
--- /dev/null
+++ b/LayoutTests/fast/frames/iframe-access-screen-of-deleted-expected.txt
@@ -0,0 +1,2 @@
+
+This tests that accessing screen attributes doesn't crash even if containing frame is removed from the parent.
diff --git a/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html b/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html
new file mode 100644
index 0000000..a592173
--- /dev/null
+++ b/LayoutTests/fast/frames/iframe-access-screen-of-deleted.html
@@ -0,0 +1,36 @@
+<html>
+<head>
+    <script>
+    function accessAttributes(s) {
+        var value = 0;
+        value = s.height;
+        value = s.width;
+        value = s.colorDepth;
+        value = s.pixelDepth;
+        value = s.availLeft;
+        value = s.availTop;
+        value = s.availHeight;
+        value = s.availWidth;
+    }
+
+    function runTests() {
+        if (window.layoutTestController)
+            layoutTestController.dumpAsText();
+            
+        var f = document.getElementById('theframe');
+        var s = f.contentWindow.screen;
+        accessAttributes(s);
+
+        // Now remove and check that we don't crash.
+        f.parentNode.removeChild(f);
+        accessAttributes(s);
+    }
+    </script>
+</head>
+<iframe id="theframe" src="resources/red.html"></iframe>
+<body onload="runTests()">
+<div>
+This tests that accessing screen attributes doesn't crash even if containing frame is removed from the parent.
+</div>
+</body>
+</html>
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c270787..b649c3e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-09  Anton Muhin  <antonm at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Accept and bailout NULL widgets in ChromiumBridge
+        https://bugs.webkit.org/show_bug.cgi?id=35796
+
+        * src/ChromiumBridge.cpp:
+        (WebCore::toChromeClientImpl):
+
 2010-03-09  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index 67811bd..1df7f07 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -93,6 +93,9 @@ namespace WebCore {
 
 static ChromeClientImpl* toChromeClientImpl(Widget* widget)
 {
+    if (!widget)
+        return 0;
+
     FrameView* view;
     if (widget->isFrameView())
         view = static_cast<FrameView*>(widget);

-- 
WebKit Debian packaging

