| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 #ifndef ProgressTracker_h | 26 #ifndef ProgressTracker_h |
| 27 #define ProgressTracker_h | 27 #define ProgressTracker_h |
| 28 | 28 |
| 29 #include "core/CoreExport.h" | 29 #include "core/CoreExport.h" |
| 30 #include "platform/heap/Handle.h" | 30 #include "platform/heap/Handle.h" |
| 31 #include "wtf/Allocator.h" | 31 #include "wtf/Allocator.h" |
| 32 #include "wtf/Forward.h" | 32 #include "wtf/Forward.h" |
| 33 #include "wtf/HashMap.h" | 33 #include "wtf/HashMap.h" |
| 34 #include "wtf/Noncopyable.h" | 34 #include "wtf/Noncopyable.h" |
| 35 #include "wtf/OwnPtr.h" | 35 #include <memory> |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 class LocalFrame; | 39 class LocalFrame; |
| 40 class ResourceResponse; | 40 class ResourceResponse; |
| 41 struct ProgressItem; | 41 struct ProgressItem; |
| 42 | 42 |
| 43 // FIXME: This is only used on Android. Android is the only Chrome | 43 // FIXME: This is only used on Android. Android is the only Chrome |
| 44 // browser which shows a progress bar during loading. | 44 // browser which shows a progress bar during loading. |
| 45 // We should find a better way for Android to get this data and remove this! | 45 // We should find a better way for Android to get this data and remove this! |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 unsigned long m_mainResourceIdentifier; | 77 unsigned long m_mainResourceIdentifier; |
| 78 long long m_totalPageAndResourceBytesToLoad; | 78 long long m_totalPageAndResourceBytesToLoad; |
| 79 long long m_totalBytesReceived; | 79 long long m_totalBytesReceived; |
| 80 double m_lastNotifiedProgressValue; | 80 double m_lastNotifiedProgressValue; |
| 81 double m_lastNotifiedProgressTime; | 81 double m_lastNotifiedProgressTime; |
| 82 double m_progressNotificationInterval; | 82 double m_progressNotificationInterval; |
| 83 double m_progressNotificationTimeInterval; | 83 double m_progressNotificationTimeInterval; |
| 84 bool m_finalProgressChangedSent; | 84 bool m_finalProgressChangedSent; |
| 85 double m_progressValue; | 85 double m_progressValue; |
| 86 | 86 |
| 87 HashMap<unsigned long, OwnPtr<ProgressItem>> m_progressItems; | 87 HashMap<unsigned long, std::unique_ptr<ProgressItem>> m_progressItems; |
| 88 }; | 88 }; |
| 89 | 89 |
| 90 } // namespace blink | 90 } // namespace blink |
| 91 | 91 |
| 92 #endif | 92 #endif |
| OLD | NEW |