Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

2 files changed, 24 insertions, 12 deletions

diff --git a/WebKit/chromium/tests/DragImageTest.cpp b/WebKit/chromium/tests/DragImageTest.cpp
index 7b7d4ee..8ce6fe2 100644
--- a/WebKit/chromium/tests/DragImageTest.cpp
+++ b/WebKit/chromium/tests/DragImageTest.cpp
@@ -43,6 +43,11 @@ namespace {
 class TestImage : public Image {
 public:
 
+    static PassRefPtr<TestImage> create(const IntSize& size)
+    {
+        return adoptRef(new TestImage(size));
+    }
+
     explicit TestImage(const IntSize& size)
         : Image(0)
         , m_size(size)
@@ -108,8 +113,8 @@ TEST(DragImageTest, NullHandling)
 
 TEST(DragImageTest, NonNullHandling)
 {
-    TestImage testImage(IntSize(2, 2));
-    DragImageRef dragImage = createDragImageFromImage(&testImage);
+    RefPtr<TestImage> testImage(TestImage::create(IntSize(2, 2)));
+    DragImageRef dragImage = createDragImageFromImage(testImage.get());
     ASSERT_TRUE(dragImage);
 
     dragImage = scaleDragImage(dragImage, FloatSize(0.5, 0.5));
@@ -129,17 +134,17 @@ TEST(DragImageTest, CreateDragImage)
     {
         // Tests that the DrageImage implementation doesn't choke on null values
         // of nativeImageForCurrentFrame().
-        TestImage testImage((IntSize()));
-        EXPECT_FALSE(createDragImageFromImage(&testImage));
+        RefPtr<TestImage> testImage(TestImage::create(IntSize()));
+        EXPECT_FALSE(createDragImageFromImage(testImage.get()));
     }
 
     {
         // Tests that the drag image is a deep copy.
-        TestImage testImage(IntSize(1, 1));
-        DragImageRef dragImage = createDragImageFromImage(&testImage);
+        RefPtr<TestImage> testImage(TestImage::create(IntSize(1, 1)));
+        DragImageRef dragImage = createDragImageFromImage(testImage.get());
         ASSERT_TRUE(dragImage);
-        SkAutoLockPixels lock1(*dragImage), lock2(*testImage.nativeImageForCurrentFrame());
-        EXPECT_NE(dragImage->getPixels(), testImage.nativeImageForCurrentFrame()->getPixels());
+        SkAutoLockPixels lock1(*dragImage), lock2(*(testImage->nativeImageForCurrentFrame()));
+        EXPECT_NE(dragImage->getPixels(), testImage->nativeImageForCurrentFrame()->getPixels());
     }
 }
 
diff --git a/WebKit/chromium/tests/PopupMenuTest.cpp b/WebKit/chromium/tests/PopupMenuTest.cpp
index 9a45dc2..6680d74 100644
--- a/WebKit/chromium/tests/PopupMenuTest.cpp
+++ b/WebKit/chromium/tests/PopupMenuTest.cpp
@@ -107,8 +107,15 @@ public:
 
 class TestWebPopupMenuImpl : public WebPopupMenuImpl {
 public:
-    TestWebPopupMenuImpl(WebWidgetClient* client) : WebPopupMenuImpl(client) { }
+    static PassRefPtr<TestWebPopupMenuImpl> create(WebWidgetClient* client)
+    {
+        return adoptRef(new TestWebPopupMenuImpl(client));
+    }
+
     ~TestWebPopupMenuImpl() { }
+
+private:
+    TestWebPopupMenuImpl(WebWidgetClient* client) : WebPopupMenuImpl(client) { }
 };
 
 class TestWebWidget : public WebWidget {
@@ -135,10 +142,10 @@ public:
 
 class TestWebViewClient : public WebViewClient {
 public:
-    TestWebViewClient() : m_webPopupMenu(&m_webWidgetClient) { }
+    TestWebViewClient() : m_webPopupMenu(TestWebPopupMenuImpl::create(&m_webWidgetClient)) { }
     ~TestWebViewClient() { }
 
-    virtual WebWidget* createPopupMenu(WebPopupType) { return &m_webPopupMenu; }
+    virtual WebWidget* createPopupMenu(WebPopupType) { return m_webPopupMenu.get(); }
 
     // We need to override this so that the popup menu size is not 0
     // (the layout code checks to see if the popup fits on the screen).
@@ -152,7 +159,7 @@ public:
 
 private:
     TestWebWidgetClient m_webWidgetClient;
-    TestWebPopupMenuImpl m_webPopupMenu;
+    RefPtr<TestWebPopupMenuImpl> m_webPopupMenu;
 };
 
 class TestWebFrameClient : public WebFrameClient {