| OLD | NEW |
| 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 static const int maxNumberOfFrames = 1000; | 95 static const int maxNumberOfFrames = 1000; |
| 96 void incrementSubframeCount() { ++m_subframeCount; } | 96 void incrementSubframeCount() { ++m_subframeCount; } |
| 97 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount;
} | 97 void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount;
} |
| 98 int subframeCount() const; | 98 int subframeCount() const; |
| 99 | 99 |
| 100 private: | 100 private: |
| 101 explicit FrameHost(Page&); | 101 explicit FrameHost(Page&); |
| 102 | 102 |
| 103 RawPtrWillBeMember<Page> m_page; | 103 RawPtrWillBeMember<Page> m_page; |
| 104 const OwnPtrWillBeMember<TopControls> m_topControls; | 104 const OwnPtrWillBeMember<TopControls> m_topControls; |
| 105 const OwnPtrWillBeMember<PinchViewport> m_pinchViewport; | 105 const OwnPtr<PinchViewport> m_pinchViewport; |
| 106 const OwnPtrWillBeMember<EventHandlerRegistry> m_eventHandlerRegistry; | 106 const OwnPtrWillBeMember<EventHandlerRegistry> m_eventHandlerRegistry; |
| 107 const OwnPtrWillBeMember<ConsoleMessageStorage> m_consoleMessageStorage; | 107 const OwnPtrWillBeMember<ConsoleMessageStorage> m_consoleMessageStorage; |
| 108 | 108 |
| 109 AtomicString m_overrideEncoding; | 109 AtomicString m_overrideEncoding; |
| 110 int m_subframeCount; | 110 int m_subframeCount; |
| 111 }; | 111 }; |
| 112 | 112 |
| 113 } | 113 } |
| 114 | 114 |
| 115 #endif // FrameHost_h | 115 #endif // FrameHost_h |
| OLD | NEW |