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

knorton at google.com knorton at google.com
Wed Dec 22 12:13:50 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 41ea993c80ee18021c508e153b83c675820e647a
Author: knorton at google.com <knorton at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 16:27:42 2010 +0000

    2010-08-17  Kelly Norton  <knorton at google.com>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Fixes a crash in addTimelineRecord when InspectorTimelineAgent
            is enabled through WebDevToolsAgentImpl::setApuEnabled.
            https://bugs.webkit.org/show_bug.cgi?id=44105
    
            * src/WebDevToolsAgentImpl.cpp:
            (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65510 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 1eda449..4d3bc1a 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-17  Kelly Norton  <knorton at google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Fixes a crash in addTimelineRecord when InspectorTimelineAgent
+        is enabled through WebDevToolsAgentImpl::setApuEnabled.
+        https://bugs.webkit.org/show_bug.cgi?id=44105
+
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::setApuAgentEnabled):
+
 2010-08-17  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index 9a139de..9895271 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -287,6 +287,8 @@ void WebDevToolsAgentImpl::setApuAgentEnabled(bool enabled)
     m_apuAgentEnabled = enabled;
     InspectorController* ic = inspectorController();
     if (enabled) {
+        if (!ic->hasFrontend())
+            frontendLoaded();
         m_resourceTrackingWasEnabled = ic->resourceTrackingEnabled();
         ic->startTimelineProfiler();
         if (!m_resourceTrackingWasEnabled) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list