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

Side by Side Diff: Source/core/dom/DocumentLifecycle.cpp

Issue 150423004: Move Document::m_inStyleRecalc into DocumentLifecycle (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename state Created 6 years, 10 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/dom/DocumentLifecycle.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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 42
43 DocumentLifecycle::~DocumentLifecycle() 43 DocumentLifecycle::~DocumentLifecycle()
44 { 44 {
45 } 45 }
46 46
47 void DocumentLifecycle::advanceTo(State state) 47 void DocumentLifecycle::advanceTo(State state)
48 { 48 {
49 // FIXME: We can dispose a document multiple times. This seems wrong. 49 // FIXME: We can dispose a document multiple times. This seems wrong.
50 // See https://code.google.com/p/chromium/issues/detail?id=301668. 50 // See https://code.google.com/p/chromium/issues/detail?id=301668.
51 ASSERT(state > m_state || (state == Disposed && m_state == Disposed)); 51 ASSERT(state > m_state || (state == Disposed && m_state == Disposed) || (isA ctive() && state == Clean));
52 m_state = state; 52 m_state = state;
53 } 53 }
54 54
55 } 55 }
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentLifecycle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698