| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 InspectorInstrumentation::frameAttachedToParent(frame); | 173 InspectorInstrumentation::frameAttachedToParent(frame); |
| 174 return frame; | 174 return frame; |
| 175 } | 175 } |
| 176 | 176 |
| 177 void LocalFrame::setView(FrameView* view) | 177 void LocalFrame::setView(FrameView* view) |
| 178 { | 178 { |
| 179 ASSERT(!m_view || m_view != view); | 179 ASSERT(!m_view || m_view != view); |
| 180 ASSERT(!document() || !document()->isActive()); | 180 ASSERT(!document() || !document()->isActive()); |
| 181 | 181 |
| 182 eventHandler().clear(); | 182 eventHandler().clear(); |
| 183 | |
| 184 m_view = view; | 183 m_view = view; |
| 185 } | 184 } |
| 186 | 185 |
| 187 void LocalFrame::createView(const IntSize& viewportSize, const Color& background
Color, bool transparent, | 186 void LocalFrame::createView(const IntSize& viewportSize, const Color& background
Color, bool transparent, |
| 188 ScrollbarMode horizontalScrollbarMode, bool horizontalLock, | 187 ScrollbarMode horizontalScrollbarMode, bool horizontalLock, |
| 189 ScrollbarMode verticalScrollbarMode, bool verticalLock) | 188 ScrollbarMode verticalScrollbarMode, bool verticalLock) |
| 190 { | 189 { |
| 191 ASSERT(this); | 190 ASSERT(this); |
| 192 ASSERT(page()); | 191 ASSERT(page()); |
| 193 | 192 |
| (...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 821 { | 820 { |
| 822 m_frame->disableNavigation(); | 821 m_frame->disableNavigation(); |
| 823 } | 822 } |
| 824 | 823 |
| 825 FrameNavigationDisabler::~FrameNavigationDisabler() | 824 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 826 { | 825 { |
| 827 m_frame->enableNavigation(); | 826 m_frame->enableNavigation(); |
| 828 } | 827 } |
| 829 | 828 |
| 830 } // namespace blink | 829 } // namespace blink |
| OLD | NEW |