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

jer.noble at apple.com jer.noble at apple.com
Wed Dec 22 15:04:43 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 39441496f2ae88a6d590a54c940b705aa8083df1
Author: jer.noble at apple.com <jer.noble at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 21:21:02 2010 +0000

    2010-10-18  Jer Noble  <jer.noble at apple.com>
    
            Reviewed by Eric Carlson.
    
            Safari fullscreen media element tickles when it should not.
    
            https://bugs.webkit.org/show_bug.cgi?id=47861
    
            * WebView/WebVideoFullscreenController.mm:
            (-[WebVideoFullscreenController updatePowerAssertions]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70708 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 294d2d5..46bbbdf 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-18  Jer Noble  <jer.noble at apple.com>
+
+        Reviewed by Eric Carlson.
+
+        Safari fullscreen media element tickles when it should not.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=47861
+
+        * WebView/WebVideoFullscreenController.mm:
+        (-[WebVideoFullscreenController updatePowerAssertions]):
+
 2010-10-26  Jenn Braithwaite  <jennb at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebKit/mac/WebView/WebVideoFullscreenController.mm b/WebKit/mac/WebView/WebVideoFullscreenController.mm
index 1efb93f..d3ec127 100644
--- a/WebKit/mac/WebView/WebVideoFullscreenController.mm
+++ b/WebKit/mac/WebView/WebVideoFullscreenController.mm
@@ -414,11 +414,11 @@ static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
     if (rate && !_isEndingFullscreen) {
         [self _disableIdleSystemSleep];
         [self _disableIdleDisplaySleep];
-        [self _disableTickleTimer];
+        [self _enableTickleTimer];
     } else {
         [self _enableIdleSystemSleep];
         [self _enableIdleDisplaySleep];
-        [self _enableTickleTimer];
+        [self _disableTickleTimer];
     }
 #endif
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list