1 files changed, 14 insertions, 12 deletions
diff --git a/chromium/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp b/chromium/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp
index e4095502200..811336dac68 100644
--- a/chromium/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp
+++ b/chromium/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp
@@ -31,9 +31,10 @@
 #include "config.h"
 #include "core/testing/DummyPageHolder.h"
 
-#include "core/frame/DOMWindow.h"
-#include "core/frame/Frame.h"
+#include "core/frame/LocalDOMWindow.h"
 #include "core/frame/FrameView.h"
+#include "core/frame/LocalFrame.h"
+#include "core/frame/Settings.h"
 #include "wtf/Assertions.h"
 
 namespace WebCore {
@@ -45,24 +46,25 @@ PassOwnPtr<DummyPageHolder> DummyPageHolder::create(const IntSize& initialViewSi
 
 DummyPageHolder::DummyPageHolder(const IntSize& initialViewSize)
 {
-    m_pageClients.chromeClient = &m_chromeClient;
-    m_pageClients.contextMenuClient = &m_contextMenuClient;
-    m_pageClients.editorClient = &m_editorClient;
-    m_pageClients.dragClient = &m_dragClient;
-    m_pageClients.inspectorClient = &m_inspectorClient;
-    m_pageClients.backForwardClient = &m_backForwardClient;
+    fillWithEmptyClients(m_pageClients);
+    m_page = adoptPtrWillBeNoop(new Page(m_pageClients));
+    Settings& settings = m_page->settings();
+    // FIXME: http://crbug.com/363843. This needs to find a better way to
+    // not create graphics layers.
+    settings.setAcceleratedCompositingEnabled(false);
 
-    m_page = adoptPtr(new Page(m_pageClients));
-
-    m_frame = Frame::create(FrameInit::create(0, m_page.get(), &m_frameLoaderClient));
+    m_frame = LocalFrame::create(&m_frameLoaderClient, &m_page->frameHost(), 0);
     m_frame->setView(FrameView::create(m_frame.get(), initialViewSize));
     m_frame->init();
 }
 
 DummyPageHolder::~DummyPageHolder()
 {
+    m_page->willBeDestroyed();
     m_page.clear();
+#if !ENABLE(OILPAN)
     ASSERT(m_frame->hasOneRef());
+#endif
     m_frame.clear();
 }
 
@@ -71,7 +73,7 @@ Page& DummyPageHolder::page() const
     return *m_page;
 }
 
-Frame& DummyPageHolder::frame() const
+LocalFrame& DummyPageHolder::frame() const
 {
     return *m_frame;
 }