| 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 inline float parentTextZoomFactor(LocalFrame* frame) | 232 inline float parentTextZoomFactor(LocalFrame* frame) |
| 233 { | 233 { |
| 234 Frame* parent = frame->tree().parent(); | 234 Frame* parent = frame->tree().parent(); |
| 235 if (!parent || !parent->isLocalFrame()) | 235 if (!parent || !parent->isLocalFrame()) |
| 236 return 1; | 236 return 1; |
| 237 return toLocalFrame(parent)->textZoomFactor(); | 237 return toLocalFrame(parent)->textZoomFactor(); |
| 238 } | 238 } |
| 239 | 239 |
| 240 } // namespace | 240 } // namespace |
| 241 | 241 |
| 242 template class CORE_TEMPLATE_EXPORT Supplement<LocalFrame>; |
| 243 |
| 242 LocalFrame* LocalFrame::create(FrameLoaderClient* client, FrameHost* host, Frame
Owner* owner, ServiceRegistry* serviceRegistry) | 244 LocalFrame* LocalFrame::create(FrameLoaderClient* client, FrameHost* host, Frame
Owner* owner, ServiceRegistry* serviceRegistry) |
| 243 { | 245 { |
| 244 LocalFrame* frame = new LocalFrame(client, host, owner, serviceRegistry ? se
rviceRegistry : ServiceRegistry::getEmptyServiceRegistry()); | 246 LocalFrame* frame = new LocalFrame(client, host, owner, serviceRegistry ? se
rviceRegistry : ServiceRegistry::getEmptyServiceRegistry()); |
| 245 InspectorInstrumentation::frameAttachedToParent(frame); | 247 InspectorInstrumentation::frameAttachedToParent(frame); |
| 246 return frame; | 248 return frame; |
| 247 } | 249 } |
| 248 | 250 |
| 249 void LocalFrame::setView(FrameView* view) | 251 void LocalFrame::setView(FrameView* view) |
| 250 { | 252 { |
| 251 ASSERT(!m_view || m_view != view); | 253 ASSERT(!m_view || m_view != view); |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 866 m_frame->client()->frameBlameContext()->Enter(); | 868 m_frame->client()->frameBlameContext()->Enter(); |
| 867 } | 869 } |
| 868 | 870 |
| 869 ScopedFrameBlamer::~ScopedFrameBlamer() | 871 ScopedFrameBlamer::~ScopedFrameBlamer() |
| 870 { | 872 { |
| 871 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 873 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
| 872 m_frame->client()->frameBlameContext()->Leave(); | 874 m_frame->client()->frameBlameContext()->Leave(); |
| 873 } | 875 } |
| 874 | 876 |
| 875 } // namespace blink | 877 } // namespace blink |
| OLD | NEW |