Fix focus rings by adding back in the SkPicture constructor.

Change-Id: I31e3786742f0ae05c9f6c8ab23b4dbd0c790dfc5

diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index b80171e..86400c2 100644 (file)
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -111,6 +111,27 @@ LayerAndroid::LayerAndroid(const LayerAndroid& layer) : SkLayer(layer),
     gDebugLayerAndroidInstances++;
 }
 
+LayerAndroid::LayerAndroid(SkPicture* picture) : SkLayer(),
+    m_isRootLayer(true),
+    m_haveClip(false),
+    m_doRotation(false),
+    m_isFixed(false),
+    m_recordingPicture(picture),
+    m_foregroundPicture(0),
+    m_contentsImage(0),
+    m_extra(0),
+    m_uniqueId(-1)
+{
+    m_angleTransform = 0;
+    m_translation.set(0, 0);
+    m_scale.set(1, 1);
+    m_backgroundColor = 0;
+    m_foregroundClip.setEmpty();
+    m_foregroundLocation.set(0, 0);
+    SkSafeRef(m_recordingPicture);
+    gDebugLayerAndroidInstances++;
+}
+
 LayerAndroid::~LayerAndroid()
 {
     removeChildren();

diff --git a/WebCore/platform/graphics/android/LayerAndroid.h b/WebCore/platform/graphics/android/LayerAndroid.h
index 2c11958..b74a8c8 100644 (file)
--- a/WebCore/platform/graphics/android/LayerAndroid.h
+++ b/WebCore/platform/graphics/android/LayerAndroid.h
@@ -77,6 +77,7 @@ class LayerAndroid : public SkLayer {
 public:
     LayerAndroid(bool isRootLayer);
     LayerAndroid(const LayerAndroid& layer);
+    LayerAndroid(SkPicture*);
     virtual ~LayerAndroid();
 
     static int instancesCount();