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

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

Issue 618253002: Revert of Streamline frame detach (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/FrameHost.h ('k') | Source/core/frame/LocalFrame.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 29 matching lines...) Expand all
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(adoptPtr(new PinchViewport(*this)))
49 , m_eventHandlerRegistry(adoptPtrWillBeNoop(new EventHandlerRegistry(*this)) ) 49 , m_eventHandlerRegistry(adoptPtrWillBeNoop(new EventHandlerRegistry(*this)) )
50 , m_frameCount(0)
51 { 50 {
52 } 51 }
53 52
54 // Explicitly in the .cpp to avoid default constructor in .h 53 // Explicitly in the .cpp to avoid default constructor in .h
55 FrameHost::~FrameHost() 54 FrameHost::~FrameHost()
56 { 55 {
57 } 56 }
58 57
59 Settings& FrameHost::settings() const 58 Settings& FrameHost::settings() const
60 { 59 {
(...skipping 24 matching lines...) Expand all
85 { 84 {
86 return *m_eventHandlerRegistry; 85 return *m_eventHandlerRegistry;
87 } 86 }
88 87
89 void FrameHost::trace(Visitor* visitor) 88 void FrameHost::trace(Visitor* visitor)
90 { 89 {
91 visitor->trace(m_page); 90 visitor->trace(m_page);
92 visitor->trace(m_eventHandlerRegistry); 91 visitor->trace(m_eventHandlerRegistry);
93 } 92 }
94 93
95 #if ENABLE(ASSERT)
96 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame)
97 {
98 ASSERT(expectedFrameCount >= 0);
99
100 int actualFrameCount = 0;
101 for (; frame; frame = frame->tree().traverseNext())
102 ++actualFrameCount;
103
104 ASSERT(expectedFrameCount == actualFrameCount);
105 } 94 }
106 #endif
107
108 int FrameHost::frameCount() const
109 {
110 #if ENABLE(ASSERT)
111 checkFrameCountConsistency(m_frameCount, m_page->mainFrame());
112 #endif
113 return m_frameCount;
114 }
115
116 }
OLDNEW
« no previous file with comments | « Source/core/frame/FrameHost.h ('k') | Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698