Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: Source/core/testing/DummyPageHolder.cpp

Issue 281393002: Revert of Make all layout tests force composited (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/InspectorOverlay.cpp ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/testing/DummyPageHolder.h" 32 #include "core/testing/DummyPageHolder.h"
33 33
34 #include "core/frame/DOMWindow.h" 34 #include "core/frame/DOMWindow.h"
35 #include "core/frame/FrameView.h" 35 #include "core/frame/FrameView.h"
36 #include "core/frame/LocalFrame.h" 36 #include "core/frame/LocalFrame.h"
37 #include "core/frame/Settings.h"
38 #include "wtf/Assertions.h" 37 #include "wtf/Assertions.h"
39 38
40 namespace WebCore { 39 namespace WebCore {
41 40
42 PassOwnPtr<DummyPageHolder> DummyPageHolder::create(const IntSize& initialViewSi ze) 41 PassOwnPtr<DummyPageHolder> DummyPageHolder::create(const IntSize& initialViewSi ze)
43 { 42 {
44 return adoptPtr(new DummyPageHolder(initialViewSize)); 43 return adoptPtr(new DummyPageHolder(initialViewSize));
45 } 44 }
46 45
47 DummyPageHolder::DummyPageHolder(const IntSize& initialViewSize) 46 DummyPageHolder::DummyPageHolder(const IntSize& initialViewSize)
48 { 47 {
49 m_pageClients.chromeClient = &m_chromeClient; 48 m_pageClients.chromeClient = &m_chromeClient;
50 m_pageClients.contextMenuClient = &m_contextMenuClient; 49 m_pageClients.contextMenuClient = &m_contextMenuClient;
51 m_pageClients.editorClient = &m_editorClient; 50 m_pageClients.editorClient = &m_editorClient;
52 m_pageClients.dragClient = &m_dragClient; 51 m_pageClients.dragClient = &m_dragClient;
53 m_pageClients.inspectorClient = &m_inspectorClient; 52 m_pageClients.inspectorClient = &m_inspectorClient;
54 m_pageClients.backForwardClient = &m_backForwardClient; 53 m_pageClients.backForwardClient = &m_backForwardClient;
55 54
56 m_page = adoptPtrWillBeNoop(new Page(m_pageClients)); 55 m_page = adoptPtrWillBeNoop(new Page(m_pageClients));
57 Settings& settings = m_page->settings();
58 // FIXME: http://crbug.com/363843. This needs to find a better way to
59 // not create graphics layers.
60 settings.setAcceleratedCompositingEnabled(false);
61 56
62 m_frame = LocalFrame::create(&m_frameLoaderClient, &m_page->frameHost(), 0); 57 m_frame = LocalFrame::create(&m_frameLoaderClient, &m_page->frameHost(), 0);
63 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize)); 58 m_frame->setView(FrameView::create(m_frame.get(), initialViewSize));
64 m_frame->init(); 59 m_frame->init();
65 } 60 }
66 61
67 DummyPageHolder::~DummyPageHolder() 62 DummyPageHolder::~DummyPageHolder()
68 { 63 {
69 m_page->willBeDestroyed(); 64 m_page->willBeDestroyed();
70 m_page.clear(); 65 m_page.clear();
(...skipping 17 matching lines...) Expand all
88 { 83 {
89 return *m_frame->view(); 84 return *m_frame->view();
90 } 85 }
91 86
92 Document& DummyPageHolder::document() const 87 Document& DummyPageHolder::document() const
93 { 88 {
94 return *m_frame->domWindow()->document(); 89 return *m_frame->domWindow()->document();
95 } 90 }
96 91
97 } // namespace WebCore 92 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorOverlay.cpp ('k') | Source/web/WebEmbeddedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698