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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
59 void completeProgress(unsigned long identifier); | 59 void completeProgress(unsigned long identifier); |
60 | 60 |
61 long long totalPageAndResourceBytesToLoad() const { return m_totalPageAndRes ourceBytesToLoad; } | 61 long long totalPageAndResourceBytesToLoad() const { return m_totalPageAndRes ourceBytesToLoad; } |
62 long long totalBytesReceived() const { return m_totalBytesReceived; } | 62 long long totalBytesReceived() const { return m_totalBytesReceived; } |
63 | 63 |
64 private: | 64 private: |
65 ProgressTracker(LocalFrame*); | 65 ProgressTracker(LocalFrame*); |
66 | 66 |
67 void reset(); | 67 void reset(); |
68 | 68 |
69 // This bare frame pointer is safe; it refers to the | |
Mads Ager (chromium)
2014/09/18 12:00:59
Are there finalization order issues with moving Pr
sof
2014/09/18 13:31:15
Yes, that was where I landed in the end -- there a
| |
70 // owning frame (via FrameLoader.) | |
71 // | |
72 // ProgressTracker is finalized by FrameLoader (which in turn is | |
73 // finalized by LocalFrame.) Its lifetime thus guarantees that | |
74 // m_frame cannot be used to access a dead LocalFrame. | |
69 LocalFrame* m_frame; | 75 LocalFrame* m_frame; |
70 bool m_inProgress; | 76 bool m_inProgress; |
71 long long m_totalPageAndResourceBytesToLoad; | 77 long long m_totalPageAndResourceBytesToLoad; |
72 long long m_totalBytesReceived; | 78 long long m_totalBytesReceived; |
73 double m_lastNotifiedProgressValue; | 79 double m_lastNotifiedProgressValue; |
74 double m_lastNotifiedProgressTime; | 80 double m_lastNotifiedProgressTime; |
75 double m_progressNotificationInterval; | 81 double m_progressNotificationInterval; |
76 double m_progressNotificationTimeInterval; | 82 double m_progressNotificationTimeInterval; |
77 bool m_finalProgressChangedSent; | 83 bool m_finalProgressChangedSent; |
78 double m_progressValue; | 84 double m_progressValue; |
79 | 85 |
80 HashMap<unsigned long, OwnPtr<ProgressItem> > m_progressItems; | 86 HashMap<unsigned long, OwnPtr<ProgressItem> > m_progressItems; |
81 }; | 87 }; |
82 | 88 |
83 } | 89 } |
84 | 90 |
85 #endif | 91 #endif |
OLD | NEW |