| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 4 * (http://www.torchmobile.com/) | 4 * (http://www.torchmobile.com/) |
| 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 6 * Copyright (C) 2011 Google Inc. All rights reserved. | 6 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 7 * | 7 * |
| 8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
| 9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
| 10 * are met: | 10 * are met: |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 #include "core/dom/IconURL.h" | 37 #include "core/dom/IconURL.h" |
| 38 #include "core/dom/SandboxFlags.h" | 38 #include "core/dom/SandboxFlags.h" |
| 39 #include "core/dom/SecurityContext.h" | 39 #include "core/dom/SecurityContext.h" |
| 40 #include "core/fetch/ResourceLoaderOptions.h" | 40 #include "core/fetch/ResourceLoaderOptions.h" |
| 41 #include "core/frame/FrameTypes.h" | 41 #include "core/frame/FrameTypes.h" |
| 42 #include "core/loader/FrameLoaderStateMachine.h" | 42 #include "core/loader/FrameLoaderStateMachine.h" |
| 43 #include "core/loader/FrameLoaderTypes.h" | 43 #include "core/loader/FrameLoaderTypes.h" |
| 44 #include "core/loader/HistoryItem.h" | 44 #include "core/loader/HistoryItem.h" |
| 45 #include "core/loader/NavigationPolicy.h" | 45 #include "core/loader/NavigationPolicy.h" |
| 46 #include "platform/Timer.h" | 46 #include "platform/Timer.h" |
| 47 #include "platform/TracedValue.h" | |
| 48 #include "platform/heap/Handle.h" | 47 #include "platform/heap/Handle.h" |
| 49 #include "platform/network/ResourceRequest.h" | 48 #include "platform/network/ResourceRequest.h" |
| 49 #include "platform/tracing/TracedValue.h" |
| 50 #include "public/platform/WebInsecureRequestPolicy.h" | 50 #include "public/platform/WebInsecureRequestPolicy.h" |
| 51 #include "wtf/Forward.h" | 51 #include "wtf/Forward.h" |
| 52 #include "wtf/HashSet.h" | 52 #include "wtf/HashSet.h" |
| 53 #include <memory> | 53 #include <memory> |
| 54 | 54 |
| 55 namespace blink { | 55 namespace blink { |
| 56 | 56 |
| 57 class DocumentLoader; | 57 class DocumentLoader; |
| 58 class HTMLFormElement; | 58 class HTMLFormElement; |
| 59 class Frame; | 59 class Frame; |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 SandboxFlags m_forcedSandboxFlags; | 317 SandboxFlags m_forcedSandboxFlags; |
| 318 | 318 |
| 319 bool m_dispatchingDidClearWindowObjectInMainWorld; | 319 bool m_dispatchingDidClearWindowObjectInMainWorld; |
| 320 bool m_protectProvisionalLoader; | 320 bool m_protectProvisionalLoader; |
| 321 bool m_isNavigationHandledByClient; | 321 bool m_isNavigationHandledByClient; |
| 322 }; | 322 }; |
| 323 | 323 |
| 324 } // namespace blink | 324 } // namespace blink |
| 325 | 325 |
| 326 #endif // FrameLoader_h | 326 #endif // FrameLoader_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2391383002:
Moving platform tracing things into platform/tracing. (Closed)
