From aea8638e780d776d51ec5d63e558eac2828ee059 Mon Sep 17 00:00:00 2001
From: "commit-queue@webkit.org"
 <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 24 Feb 2012 01:32:35 +0000
Subject: [PATCH] [chromium] Plumb video damage to the damage tracker.
 https://bugs.webkit.org/show_bug.cgi?id=79373

Patch by Jonathan Backer <backer@chromium.org> on 2012-02-23
Reviewed by James Robinson.

Source/WebCore:

* platform/graphics/chromium/VideoLayerChromium.cpp:
(WebCore::VideoLayerChromium::contentChanged):
(WebCore):
* platform/graphics/chromium/VideoLayerChromium.h:
(VideoLayerChromium):

Source/WebKit/chromium:

* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::repaint):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108703 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 Source/WebCore/ChangeLog                                    | 13 +++++++++++++
 .../platform/graphics/chromium/VideoLayerChromium.cpp       |  6 ++++++
 .../WebCore/platform/graphics/chromium/VideoLayerChromium.h |  2 ++
 Source/WebKit/chromium/ChangeLog                            | 10 ++++++++++
 Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp     |  2 +-
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ba21d23..8d22eca 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-02-23  Jonathan Backer  <backer@chromium.org>
+
+        [chromium] Plumb video damage to the damage tracker.
+        https://bugs.webkit.org/show_bug.cgi?id=79373
+
+        Reviewed by James Robinson.
+
+        * platform/graphics/chromium/VideoLayerChromium.cpp:
+        (WebCore::VideoLayerChromium::contentChanged):
+        (WebCore):
+        * platform/graphics/chromium/VideoLayerChromium.h:
+        (VideoLayerChromium):
+
 2012-02-23  MORITA Hajime  <morrita@google.com>
 
         This test checks select attribute of content element is valid.
diff --git a/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp b/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
index ae2ae8c..3b44eda 100644
--- a/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
+++ b/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
@@ -57,6 +57,12 @@ PassRefPtr<CCLayerImpl> VideoLayerChromium::createCCLayerImpl()
     return CCVideoLayerImpl::create(m_layerId, m_provider);
 }
 
+void VideoLayerChromium::contentChanged()
+{
+    m_updateRect = FloatRect(FloatPoint(), contentBounds());
+    setNeedsDisplay();
+}
+
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)
diff --git a/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h b/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h
index 878806e..65cf5c6 100644
--- a/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h
+++ b/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h
@@ -50,6 +50,8 @@ public:
 
     virtual PassRefPtr<CCLayerImpl> createCCLayerImpl();
 
+    void contentChanged();
+
 private:
     explicit VideoLayerChromium(VideoFrameProvider*);
 
diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index b9c5c14..ccabf6a 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-23  Jonathan Backer  <backer@chromium.org>
+
+        [chromium] Plumb video damage to the damage tracker.
+        https://bugs.webkit.org/show_bug.cgi?id=79373
+
+        Reviewed by James Robinson.
+
+        * src/WebMediaPlayerClientImpl.cpp:
+        (WebKit::WebMediaPlayerClientImpl::repaint):
+
 2012-02-21  James Robinson  <jamesr@chromium.org>
 
         [chromium] Notify compositor of wheel event registration via ScrollingCoordinator
diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
index 74c4a72..ec74b6b 100644
--- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
+++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
@@ -152,7 +152,7 @@ void WebMediaPlayerClientImpl::repaint()
     ASSERT(m_mediaPlayer);
 #if USE(ACCELERATED_COMPOSITING)
     if (m_videoLayer && supportsAcceleratedRendering())
-        m_videoLayer->setNeedsDisplay();
+        m_videoLayer->contentChanged();
 #endif
     m_mediaPlayer->repaint();
 }
-- 
2.7.4