OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google 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 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 28 matching lines...) Expand all Loading... |
39 { | 39 { |
40 } | 40 } |
41 | 41 |
42 bool FrameLoaderStateMachine::committingFirstRealLoad() const | 42 bool FrameLoaderStateMachine::committingFirstRealLoad() const |
43 { | 43 { |
44 return m_state == DisplayingInitialEmptyDocument; | 44 return m_state == DisplayingInitialEmptyDocument; |
45 } | 45 } |
46 | 46 |
47 bool FrameLoaderStateMachine::committedFirstRealDocumentLoad() const | 47 bool FrameLoaderStateMachine::committedFirstRealDocumentLoad() const |
48 { | 48 { |
49 return m_state >= DisplayingInitialEmptyDocumentPostCommit; | 49 return m_state >= CommittedFirstRealLoad; |
50 } | 50 } |
51 | 51 |
52 bool FrameLoaderStateMachine::creatingInitialEmptyDocument() const | 52 bool FrameLoaderStateMachine::creatingInitialEmptyDocument() const |
53 { | 53 { |
54 return m_state == CreatingInitialEmptyDocument; | 54 return m_state == CreatingInitialEmptyDocument; |
55 } | 55 } |
56 | 56 |
57 bool FrameLoaderStateMachine::isDisplayingInitialEmptyDocument() const | 57 bool FrameLoaderStateMachine::isDisplayingInitialEmptyDocument() const |
58 { | 58 { |
59 return m_state == DisplayingInitialEmptyDocument || m_state == DisplayingIni
tialEmptyDocumentPostCommit; | 59 return m_state == DisplayingInitialEmptyDocument; |
60 } | |
61 | |
62 bool FrameLoaderStateMachine::firstLayoutDone() const | |
63 { | |
64 return m_state == FirstLayoutDone; | |
65 } | 60 } |
66 | 61 |
67 void FrameLoaderStateMachine::advanceTo(State state) | 62 void FrameLoaderStateMachine::advanceTo(State state) |
68 { | 63 { |
69 ASSERT(State(m_state + 1) == state || (firstLayoutDone() && state == Committ
edFirstRealLoad)); | 64 ASSERT(State(m_state + 1) == state); |
70 m_state = state; | 65 m_state = state; |
71 } | 66 } |
72 | 67 |
73 } // namespace WebCore | 68 } // namespace WebCore |
OLD | NEW |