| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 8 * Copyright (C) 2011 Google Inc. All rights reserved. | 8 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 9 * | 9 * |
| 10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "sky/engine/core/frame/Settings.h" | 46 #include "sky/engine/core/frame/Settings.h" |
| 47 #include "sky/engine/core/inspector/ConsoleMessage.h" | 47 #include "sky/engine/core/inspector/ConsoleMessage.h" |
| 48 #include "sky/engine/core/loader/DocumentLoadTiming.h" | 48 #include "sky/engine/core/loader/DocumentLoadTiming.h" |
| 49 #include "sky/engine/core/loader/FrameLoaderClient.h" | 49 #include "sky/engine/core/loader/FrameLoaderClient.h" |
| 50 #include "sky/engine/core/loader/UniqueIdentifier.h" | 50 #include "sky/engine/core/loader/UniqueIdentifier.h" |
| 51 #include "sky/engine/core/page/ChromeClient.h" | 51 #include "sky/engine/core/page/ChromeClient.h" |
| 52 #include "sky/engine/core/page/EventHandler.h" | 52 #include "sky/engine/core/page/EventHandler.h" |
| 53 #include "sky/engine/core/page/Page.h" | 53 #include "sky/engine/core/page/Page.h" |
| 54 #include "sky/engine/platform/Logging.h" | 54 #include "sky/engine/platform/Logging.h" |
| 55 #include "sky/engine/platform/geometry/FloatRect.h" | 55 #include "sky/engine/platform/geometry/FloatRect.h" |
| 56 #include "sky/engine/platform/network/HTTPParsers.h" | |
| 57 #include "sky/engine/platform/network/ResourceRequest.h" | |
| 58 #include "sky/engine/platform/weborigin/SecurityPolicy.h" | 56 #include "sky/engine/platform/weborigin/SecurityPolicy.h" |
| 59 #include "sky/engine/public/platform/WebURLRequest.h" | |
| 60 #include "sky/engine/wtf/TemporaryChange.h" | 57 #include "sky/engine/wtf/TemporaryChange.h" |
| 61 #include "sky/engine/wtf/text/CString.h" | 58 #include "sky/engine/wtf/text/CString.h" |
| 62 #include "sky/engine/wtf/text/WTFString.h" | 59 #include "sky/engine/wtf/text/WTFString.h" |
| 63 | 60 |
| 64 using blink::WebURLRequest; | |
| 65 | |
| 66 namespace blink { | 61 namespace blink { |
| 67 | 62 |
| 68 FrameLoader::FrameLoader(LocalFrame* frame) | 63 FrameLoader::FrameLoader(LocalFrame* frame) |
| 69 : m_frame(frame) | 64 : m_frame(frame) |
| 70 , m_inStopAllLoaders(false) | 65 , m_inStopAllLoaders(false) |
| 71 { | 66 { |
| 72 } | 67 } |
| 73 | 68 |
| 74 FrameLoader::~FrameLoader() | 69 FrameLoader::~FrameLoader() |
| 75 { | 70 { |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 | 140 |
| 146 // Attempt to stop the frame if the document loader is loading, or if it is
done loading but | 141 // Attempt to stop the frame if the document loader is loading, or if it is
done loading but |
| 147 // still parsing. Failure to do so can cause a world leak. | 142 // still parsing. Failure to do so can cause a world leak. |
| 148 if (m_frame->document()->parsing()) | 143 if (m_frame->document()->parsing()) |
| 149 stopLoading(); | 144 stopLoading(); |
| 150 | 145 |
| 151 m_inStopAllLoaders = false; | 146 m_inStopAllLoaders = false; |
| 152 } | 147 } |
| 153 | 148 |
| 154 } // namespace blink | 149 } // namespace blink |
| OLD | NEW |