[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

hamaji at chromium.org hamaji at chromium.org
Thu Feb 4 21:36:02 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 9e69182903cf354a10e7f278a605318109608851
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 03:19:09 2010 +0000

    2010-02-01  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Unreviewed attempt to fix the broken build.
    
            This was introduced in http://trac.webkit.org/changeset/54182
    
            * src/WebViewImpl.cpp:
            (WebKit::WebViewImpl::performMediaPlayerAction):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54195 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a10f213..20fc36f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-01  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Unreviewed attempt to fix the broken build.
+
+        This was introduced in http://trac.webkit.org/changeset/54182
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::performMediaPlayerAction):
+
 2010-01-27  Matt Perry  <mpcomplete at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index cdf3bba..e030d72 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -1316,9 +1316,9 @@ void WebViewImpl::performMediaPlayerAction(const WebMediaPlayerAction& action,
     switch (action.type) {
     case WebMediaPlayerAction::Play:
         if (action.enable)
-            mediaElement->play();
+            mediaElement->play(mediaElement->processingUserGesture());
         else
-            mediaElement->pause();
+            mediaElement->pause(mediaElement->processingUserGesture());
         break;
     case WebMediaPlayerAction::Mute:
         mediaElement->setMuted(action.enable);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list