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

Side by Side Diff: Source/core/frame/FrameHost.cpp

Issue 642003002: Move PinchViewport to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/core/frame/FrameHost.h ('k') | Source/core/frame/PinchViewport.h » ('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 27 matching lines...) Expand all
38 38
39 namespace blink { 39 namespace blink {
40 40
41 PassOwnPtrWillBeRawPtr<FrameHost> FrameHost::create(Page& page) 41 PassOwnPtrWillBeRawPtr<FrameHost> FrameHost::create(Page& page)
42 { 42 {
43 return adoptPtrWillBeNoop(new FrameHost(page)); 43 return adoptPtrWillBeNoop(new FrameHost(page));
44 } 44 }
45 45
46 FrameHost::FrameHost(Page& page) 46 FrameHost::FrameHost(Page& page)
47 : m_page(&page) 47 : m_page(&page)
48 , m_pinchViewport(adoptPtr(new PinchViewport(*this))) 48 , m_pinchViewport(PinchViewport::create(*this))
49 , m_eventHandlerRegistry(adoptPtrWillBeNoop(new EventHandlerRegistry(*this)) ) 49 , m_eventHandlerRegistry(adoptPtrWillBeNoop(new EventHandlerRegistry(*this)) )
50 { 50 {
51 } 51 }
52 52
53 // Explicitly in the .cpp to avoid default constructor in .h 53 // Explicitly in the .cpp to avoid default constructor in .h
54 FrameHost::~FrameHost() 54 FrameHost::~FrameHost()
55 { 55 {
56 } 56 }
57 57
58 Settings& FrameHost::settings() const 58 Settings& FrameHost::settings() const
(...skipping 22 matching lines...) Expand all
81 } 81 }
82 82
83 EventHandlerRegistry& FrameHost::eventHandlerRegistry() const 83 EventHandlerRegistry& FrameHost::eventHandlerRegistry() const
84 { 84 {
85 return *m_eventHandlerRegistry; 85 return *m_eventHandlerRegistry;
86 } 86 }
87 87
88 void FrameHost::trace(Visitor* visitor) 88 void FrameHost::trace(Visitor* visitor)
89 { 89 {
90 visitor->trace(m_page); 90 visitor->trace(m_page);
91 visitor->trace(m_pinchViewport);
91 visitor->trace(m_eventHandlerRegistry); 92 visitor->trace(m_eventHandlerRegistry);
92 } 93 }
93 94
94 } 95 }
OLDNEW
« no previous file with comments | « Source/core/frame/FrameHost.h ('k') | Source/core/frame/PinchViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698