Ensure plugin content does not shift when gaining focus.

bug: 3477581
Change-Id: Ia7bbaaca405db33dbefaa8f6f00e9250580e5f7b

1 files changed, 14 insertions, 0 deletions

diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 48badf8..7963ae0 100644
--- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -25,6 +25,7 @@
 #include "GraphicsContext.h"
 #include "Image.h"
 #include "Length.h"
+#include "MediaLayer.h"
 #include "PlatformBridge.h"
 #include "PlatformGraphicsContext.h"
 #include "RenderLayerBacking.h"
@@ -321,6 +322,19 @@ void GraphicsLayerAndroid::setSize(const FloatSize& size)
         return;
     MLOG("(%x) setSize (%.2f,%.2f)", this, size.width(), size.height());
     GraphicsLayer::setSize(size);
+
+    // If it is a media layer the size may have changed as a result of the media
+    // element (e.g. plugin) gaining focus. Therefore, we must sync the size of
+    // the focus' outline so that our UI thread can draw accordingly.
+    if (m_contentLayer->isMedia() && m_client) {
+        RenderLayer* layer = renderLayerFromClient(m_client);
+        RenderBox* box = layer->renderBox();
+        int outline = box->view()->maximalOutlineSize();
+        static_cast<MediaLayer*>(m_contentLayer)->setOutlineSize(outline);
+        LOG("Media Outline: %d %p %p %p", outline, m_client, layer, box);
+        LOG("Media Size: %g,%g", size.width(), size.height());
+    }
+
     m_contentLayer->setSize(size.width(), size.height());
     askForSync();
 }