| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 #include "core/inspector/InspectorInstrumentation.h" | 64 #include "core/inspector/InspectorInstrumentation.h" |
| 65 #include "core/inspector/InstanceCounters.h" | 65 #include "core/inspector/InstanceCounters.h" |
| 66 #include "core/loader/DocumentLoadTiming.h" | 66 #include "core/loader/DocumentLoadTiming.h" |
| 67 #include "core/loader/DocumentLoader.h" | 67 #include "core/loader/DocumentLoader.h" |
| 68 #include "core/loader/FormSubmission.h" | 68 #include "core/loader/FormSubmission.h" |
| 69 #include "core/loader/FrameLoadRequest.h" | 69 #include "core/loader/FrameLoadRequest.h" |
| 70 #include "core/loader/FrameLoaderClient.h" | 70 #include "core/loader/FrameLoaderClient.h" |
| 71 #include "core/loader/LinkLoader.h" | 71 #include "core/loader/LinkLoader.h" |
| 72 #include "core/loader/MixedContentChecker.h" | 72 #include "core/loader/MixedContentChecker.h" |
| 73 #include "core/loader/NavigationScheduler.h" | 73 #include "core/loader/NavigationScheduler.h" |
| 74 #include "core/loader/NetworkHintsInterface.h" | |
| 75 #include "core/loader/ProgressTracker.h" | 74 #include "core/loader/ProgressTracker.h" |
| 76 #include "core/loader/appcache/ApplicationCacheHost.h" | 75 #include "core/loader/appcache/ApplicationCacheHost.h" |
| 77 #include "core/origin_trials/OriginTrialContext.h" | 76 #include "core/origin_trials/OriginTrialContext.h" |
| 78 #include "core/page/ChromeClient.h" | 77 #include "core/page/ChromeClient.h" |
| 79 #include "core/page/CreateWindow.h" | 78 #include "core/page/CreateWindow.h" |
| 80 #include "core/page/FrameTree.h" | 79 #include "core/page/FrameTree.h" |
| 81 #include "core/page/Page.h" | 80 #include "core/page/Page.h" |
| 82 #include "core/page/WindowFeatures.h" | 81 #include "core/page/WindowFeatures.h" |
| 83 #include "core/page/scrolling/ScrollingCoordinator.h" | 82 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 84 #include "core/svg/graphics/SVGImage.h" | 83 #include "core/svg/graphics/SVGImage.h" |
| (...skipping 1527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1612 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); | 1611 tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoa
der->url() : String()); |
| 1613 return tracedValue; | 1612 return tracedValue; |
| 1614 } | 1613 } |
| 1615 | 1614 |
| 1616 inline void FrameLoader::takeObjectSnapshot() const | 1615 inline void FrameLoader::takeObjectSnapshot() const |
| 1617 { | 1616 { |
| 1618 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); | 1617 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTraced
Value()); |
| 1619 } | 1618 } |
| 1620 | 1619 |
| 1621 } // namespace blink | 1620 } // namespace blink |
| OLD | NEW |