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

pfeldman at chromium.org pfeldman at chromium.org
Wed Dec 22 11:52:59 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 9284d57777e8f61a3de0345f89a48ca257449391
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 16:31:22 2010 +0000

    2010-08-10  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed. Qt build fix, follow up for r65072.
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::releaseFrontendLifetimeAgents):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65073 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 85e6aa8..a63477d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-10  Pavel Feldman  <pfeldman at chromium.org>
 
+        Not reviewed. Qt build fix, follow up for r65072.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::releaseFrontendLifetimeAgents):
+
+2010-08-10  Pavel Feldman  <pfeldman at chromium.org>
+
         Reviewed by Yury Semikhatsky.
 
         Web Inspector: move database processing to native layer.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 0b59617..993fed4 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -604,9 +604,12 @@ void InspectorController::releaseFrontendLifetimeAgents()
     if (m_domAgent)
         m_domAgent->reset();
     m_domAgent.clear();
+
+#if ENABLE(DATABASE)
     if (m_storageAgent)
         m_storageAgent->clearFrontend();
     m_storageAgent.clear();
+#endif
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     m_applicationCacheAgent.clear();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list