Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: Source/core/loader/FrameLoaderStateMachine.cpp

Issue 22891017: Remove FrameLoaderStateMachine::DisplayingInitialEmptyDocumentPostCommit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/FrameLoaderStateMachine.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
39 { 39 {
40 } 40 }
41 41
42 bool FrameLoaderStateMachine::startedFirstRealLoad() const 42 bool FrameLoaderStateMachine::startedFirstRealLoad() const
43 { 43 {
44 return m_state >= StartedFirstRealLoad; 44 return m_state >= StartedFirstRealLoad;
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 && m_state < CommittedFirst RealLoad;
60 } 60 }
61 61
62 void FrameLoaderStateMachine::advanceTo(State state) 62 void FrameLoaderStateMachine::advanceTo(State state)
63 { 63 {
64 ASSERT(m_state < state); 64 ASSERT(m_state < state);
65 m_state = state; 65 m_state = state;
66 } 66 }
67 67
68 } // namespace WebCore 68 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoaderStateMachine.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698