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 | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
9 * rights reserved. | 9 * rights reserved. |
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "core/frame/VisualViewport.h" | 54 #include "core/frame/VisualViewport.h" |
55 #include "core/html/HTMLFrameElementBase.h" | 55 #include "core/html/HTMLFrameElementBase.h" |
56 #include "core/html/HTMLPlugInElement.h" | 56 #include "core/html/HTMLPlugInElement.h" |
57 #include "core/input/EventHandler.h" | 57 #include "core/input/EventHandler.h" |
58 #include "core/inspector/ConsoleMessage.h" | 58 #include "core/inspector/ConsoleMessage.h" |
59 #include "core/layout/HitTestResult.h" | 59 #include "core/layout/HitTestResult.h" |
60 #include "core/layout/LayoutView.h" | 60 #include "core/layout/LayoutView.h" |
61 #include "core/layout/api/LayoutPartItem.h" | 61 #include "core/layout/api/LayoutPartItem.h" |
62 #include "core/layout/api/LayoutViewItem.h" | 62 #include "core/layout/api/LayoutViewItem.h" |
63 #include "core/layout/compositing/PaintLayerCompositor.h" | 63 #include "core/layout/compositing/PaintLayerCompositor.h" |
| 64 #include "core/loader/DocumentLoader.h" |
64 #include "core/loader/FrameLoadRequest.h" | 65 #include "core/loader/FrameLoadRequest.h" |
65 #include "core/loader/NavigationScheduler.h" | 66 #include "core/loader/NavigationScheduler.h" |
66 #include "core/page/ChromeClient.h" | 67 #include "core/page/ChromeClient.h" |
67 #include "core/page/FocusController.h" | 68 #include "core/page/FocusController.h" |
68 #include "core/page/Page.h" | 69 #include "core/page/Page.h" |
69 #include "core/page/scrolling/ScrollingCoordinator.h" | 70 #include "core/page/scrolling/ScrollingCoordinator.h" |
70 #include "core/paint/ObjectPainter.h" | 71 #include "core/paint/ObjectPainter.h" |
71 #include "core/paint/PaintInfo.h" | 72 #include "core/paint/PaintInfo.h" |
72 #include "core/paint/PaintLayer.h" | 73 #include "core/paint/PaintLayer.h" |
73 #include "core/paint/PaintLayerPainter.h" | 74 #include "core/paint/PaintLayerPainter.h" |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 } | 374 } |
374 | 375 |
375 void LocalFrame::navigate(const FrameLoadRequest& request) { | 376 void LocalFrame::navigate(const FrameLoadRequest& request) { |
376 m_loader.load(request); | 377 m_loader.load(request); |
377 } | 378 } |
378 | 379 |
379 void LocalFrame::reload(FrameLoadType loadType, | 380 void LocalFrame::reload(FrameLoadType loadType, |
380 ClientRedirectPolicy clientRedirectPolicy) { | 381 ClientRedirectPolicy clientRedirectPolicy) { |
381 DCHECK(isReloadLoadType(loadType)); | 382 DCHECK(isReloadLoadType(loadType)); |
382 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { | 383 if (clientRedirectPolicy == ClientRedirectPolicy::NotClientRedirect) { |
383 if (!m_loader.currentItem()) | 384 if (!m_loader.documentLoader()->historyItem()) |
384 return; | 385 return; |
385 FrameLoadRequest request = | 386 FrameLoadRequest request = |
386 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload( | 387 FrameLoadRequest(nullptr, m_loader.resourceRequestForReload( |
387 loadType, KURL(), clientRedirectPolicy)); | 388 loadType, KURL(), clientRedirectPolicy)); |
388 request.setClientRedirect(clientRedirectPolicy); | 389 request.setClientRedirect(clientRedirectPolicy); |
389 m_loader.load(request, loadType); | 390 m_loader.load(request, loadType); |
390 } else { | 391 } else { |
391 DCHECK_EQ(FrameLoadTypeReload, loadType); | 392 DCHECK_EQ(FrameLoadTypeReload, loadType); |
392 m_navigationScheduler->scheduleReload(); | 393 m_navigationScheduler->scheduleReload(); |
393 } | 394 } |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
923 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 924 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
924 m_frame->client()->frameBlameContext()->Enter(); | 925 m_frame->client()->frameBlameContext()->Enter(); |
925 } | 926 } |
926 | 927 |
927 ScopedFrameBlamer::~ScopedFrameBlamer() { | 928 ScopedFrameBlamer::~ScopedFrameBlamer() { |
928 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) | 929 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) |
929 m_frame->client()->frameBlameContext()->Leave(); | 930 m_frame->client()->frameBlameContext()->Leave(); |
930 } | 931 } |
931 | 932 |
932 } // namespace blink | 933 } // namespace blink |
OLD | NEW |