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

[steveblock at google.com]

The following commit has been merged in the debian/experimental branch:
commit ec7cf887c521dd3803db6c6369b1b06a9597eb97
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 15:44:53 2010 +0000

    Unreviewed fix
    
    Need to check for the existence of DeviceOrientation and DeviceMotion controllers
    
    These features can be disabled at run time, so an enable guard is not sufficient.
    This bug was introduced in http://trac.webkit.org/changeset/69646
    
    Tested with existing tests.
    
    * history/PageCache.cpp:
    (WebCore::logCanCachePageDecision):
    (WebCore::PageCache::canCache):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69666 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5f4c686..b890b6a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-13  Steve Block  <steveblock at google.com>
+
+        Unreviewed fix
+
+        Need to check for the existence of DeviceOrientation and DeviceMotion controllers
+
+        These features can be disabled at run time, so an enable guard is not sufficient.
+        This bug was introduced in http://trac.webkit.org/changeset/69646
+
+        Tested with existing tests.
+
+        * history/PageCache.cpp:
+        (WebCore::logCanCachePageDecision):
+        (WebCore::PageCache::canCache):
+
 2010-10-13  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/history/PageCache.cpp b/WebCore/history/PageCache.cpp
index 0bce3af..08ec40a 100644
--- a/WebCore/history/PageCache.cpp
+++ b/WebCore/history/PageCache.cpp
@@ -204,11 +204,11 @@ static void logCanCachePageDecision(Page* page)
         cannotCache = true;
     }
 #if ENABLE(DEVICE_ORIENTATION)
-    if (!page->deviceMotionController()->isActive()) {
+    if (page->deviceMotionController() && page->deviceMotionController()->isActive()) {
         PCLOG("   -Page is using DeviceMotion");
         cannotCache = true;
     }
-    if (!page->deviceOrientationController()->isActive()) {
+    if (page->deviceOrientationController() && page->deviceOrientationController()->isActive()) {
         PCLOG("   -Page is using DeviceOrientation");
         cannotCache = true;
     }
@@ -310,8 +310,8 @@ bool PageCache::canCache(Page* page)
         && page->backForwardList()->capacity() > 0
         && page->settings()->usesPageCache()
 #if ENABLE(DEVICE_ORIENTATION)
-        && !page->deviceMotionController()->isActive()
-        && !page->deviceOrientationController()->isActive()
+        && !(page->deviceMotionController() && page->deviceMotionController()->isActive())
+        && !(page->deviceOrientationController() && page->deviceOrientationController()->isActive())
 #endif
         && loadType != FrameLoadTypeReload
         && loadType != FrameLoadTypeReloadFromOrigin

-- 
WebKit Debian packaging