[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

tkent at chromium.org tkent at chromium.org
Wed Dec 22 12:32:49 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 08e598cd8261f40206ebc04828430ec4e66fb69d
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 06:52:01 2010 +0000

    2010-08-24  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            [DRT/Chromium] Fix 26 inspector test crashes
            https://bugs.webkit.org/show_bug.cgi?id=44580
    
            * platform/chromium/drt_expectations.txt:
    2010-08-24  Kent Tamura  <tkent at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            [DRT/Chromium] Fix 26 inspector test crashes
            https://bugs.webkit.org/show_bug.cgi?id=44580
    
            - DRTDevToolsAgent has a reference to the main WebView. So we
              should not clear it in closeDevTools() and should clear it in
              ~TestShell().
            - DRTDevToolsClient has a reference to a DevTools WebView and no
              way to update it. So we should delete DRTDevToolsClient instances
              in closeDevTools().
    
            * DumpRenderTree/chromium/TestShell.cpp:
            (TestShell::~TestShell):
            (TestShell::closeDevTools):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65988 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 522989c..7518cd5 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-24  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [DRT/Chromium] Fix 26 inspector test crashes
+        https://bugs.webkit.org/show_bug.cgi?id=44580
+
+        * platform/chromium/drt_expectations.txt:
+
 2010-08-24  Adam Barth  <abarth at webkit.org>
 
         Unskip XSSAuditor test and fix the source of flakiness.  I'll make the
diff --git a/LayoutTests/platform/chromium/drt_expectations.txt b/LayoutTests/platform/chromium/drt_expectations.txt
index d9a16ae..4e4296a 100644
--- a/LayoutTests/platform/chromium/drt_expectations.txt
+++ b/LayoutTests/platform/chromium/drt_expectations.txt
@@ -208,17 +208,7 @@ BUG50197 WIN MAC LINUX : svg/dynamic-updates/SVGRadialGradientElement-svgdom-gra
 
 // Need to implement something?
 BUG_DRT WIN : http/tests/inspector-enabled/console-log-before-frame-navigation.html = CRASH
-BUG_DRT WIN : http/tests/inspector/console-resource-errors.html = CRASH
-BUG_DRT WIN : http/tests/inspector/inspect-iframe-from-different-domain.html = CRASH
-BUG_DRT WIN : http/tests/inspector/resource-parameters.html = CRASH
-BUG_DRT WIN : inspector/console-assert.html = CRASH
-BUG_DRT WIN : inspector/console-command-clear.html = CRASH
-BUG_DRT WIN : inspector/console-dir.html = CRASH
-BUG_DRT WIN : inspector/console-eval-global.html = CRASH
-BUG_DRT WIN : inspector/console-format-collections.html = CRASH
-BUG_DRT WIN : inspector/console-log-before-inspector-open.html = CRASH
-BUG_DRT WIN : inspector/console-tests.html = CRASH
-BUG_DRT WIN : inspector/cookie-resource-match.html = CRASH
+BUG_DRT WIN : http/tests/inspector/resource-parameters.html = TEXT CRASH PASS
 BUG_DRT WIN : inspector/debugger-eval-while-paused.html = CRASH
 BUG_DRT WIN : inspector/debugger-no-nested-pause.html = CRASH
 BUG_DRT WIN : inspector/debugger-pause-in-eval-script.html = CRASH
@@ -228,22 +218,6 @@ BUG_DRT WIN : inspector/debugger-step-in.html = CRASH
 BUG_DRT WIN : inspector/debugger-step-out.html = CRASH
 BUG_DRT WIN : inspector/debugger-step-over.html = CRASH
 BUG_DRT WIN : inspector/dom-breakpoints.html = CRASH
-BUG_DRT WIN : inspector/elements-panel-limited-children.html = CRASH
-BUG_DRT WIN : inspector/elements-panel-search.html = CRASH
-BUG_DRT WIN : inspector/elements-panel-structure.html = CRASH
-BUG_DRT WIN : inspector/elements-panel-xhtml-structure.xhtml = CRASH
-BUG_DRT WIN : inspector/inspected-objects-not-overriden.html = CRASH
-BUG_DRT WIN : inspector/styles-disable-inherited.html = CRASH
-BUG_DRT WIN : inspector/styles-disable-then-enable.html = CRASH
-BUG_DRT WIN : inspector/styles-source-lines-inline.html = CRASH
-BUG_DRT WIN : inspector/styles-source-offsets.html = CRASH
-BUG_DRT WIN : inspector/syntax-highlight-html.html = CRASH
-BUG_DRT WIN : inspector/timeline-enum-stability.html = CRASH
-BUG_DRT WIN : inspector/timeline-layout.html = CRASH
-BUG_DRT WIN : inspector/timeline-network-resource.html = CRASH
-BUG_DRT WIN : inspector/timeline-parse-html.html = CRASH
-BUG_DRT WIN : inspector/timeline-script-tag-1.html = CRASH
-BUG_DRT WIN : inspector/timeline-trivial.html = CRASH
 
 
 // WebGL tests sometimes fail only on the buildbot.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 03d80e7..6b78f8f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-24  Kent Tamura  <tkent at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [DRT/Chromium] Fix 26 inspector test crashes
+        https://bugs.webkit.org/show_bug.cgi?id=44580
+
+        - DRTDevToolsAgent has a reference to the main WebView. So we
+          should not clear it in closeDevTools() and should clear it in
+          ~TestShell().
+        - DRTDevToolsClient has a reference to a DevTools WebView and no
+          way to update it. So we should delete DRTDevToolsClient instances
+          in closeDevTools().
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::~TestShell):
+        (TestShell::closeDevTools):
+
 2010-08-24  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index 0e9c56a..21a153d 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -118,6 +118,7 @@ TestShell::~TestShell()
     callJSGC();
 
     // Destroy the WebView before its WebViewHost.
+    m_drtDevToolsAgent->setWebView(0);
     m_webView->close();
 }
 
@@ -145,9 +146,7 @@ void TestShell::closeDevTools()
 {
     if (m_devTools) {
         m_drtDevToolsAgent->reset();
-        if (m_drtDevToolsClient)
-            m_drtDevToolsClient->reset();
-        m_drtDevToolsAgent->setWebView(0);
+        m_drtDevToolsClient.clear();
         closeWindow(m_devTools);
         m_devTools = 0;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list