Rename enums/functions that collide in chromium style in core/dom/

third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "wtf/Assertions.h"
 
 namespace blink {
 
 static DocumentLifecycle::DeprecatedTransition* s_deprecatedTransitionStack = 0;
 
 // TODO(skyostil): Come up with a better way to store cross-frame lifecycle
 // related data to avoid this being a global setting.
 static unsigned s_allowThrottlingCount = 0;
 
-DocumentLifecycle::Scope::Scope(DocumentLifecycle& lifecycle, State finalState)
+DocumentLifecycle::Scope::Scope(DocumentLifecycle& lifecycle, LifecycleState finalState)
     : m_lifecycle(lifecycle)
     , m_finalState(finalState)
 {
 }
 
 DocumentLifecycle::Scope::~Scope()
 {
     m_lifecycle.advanceTo(m_finalState);
 }
 
-DocumentLifecycle::DeprecatedTransition::DeprecatedTransition(State from, State to)
+DocumentLifecycle::DeprecatedTransition::DeprecatedTransition(LifecycleState from, LifecycleState to)
     : m_previous(s_deprecatedTransitionStack)
     , m_from(from)
     , m_to(to)
 {
     s_deprecatedTransitionStack = this;
 }
 
 DocumentLifecycle::DeprecatedTransition::~DeprecatedTransition()
 {
     s_deprecatedTransitionStack = m_previous;
@@ skipping 15 matching lines @@
     , m_detachCount(0)
 {
 }
 
 DocumentLifecycle::~DocumentLifecycle()
 {
 }
 
 #if ENABLE(ASSERT)
 
-bool DocumentLifecycle::canAdvanceTo(State nextState) const
+bool DocumentLifecycle::canAdvanceTo(LifecycleState nextState) const
 {
     // We can stop from anywhere.
     if (nextState == Stopping)
         return true;
 
     switch (m_state) {
     case Uninitialized:
         return nextState == Inactive;
     case Inactive:
         if (nextState == StyleClean)
@@ skipping 139 matching lines @@
     case Stopped:
         return nextState == Disposed;
     case Disposed:
         // FIXME: We can dispose a document multiple times. This seems wrong.
         // See https://code.google.com/p/chromium/issues/detail?id=301668.
         return nextState == Disposed;
     }
     return false;
 }
 
-bool DocumentLifecycle::canRewindTo(State nextState) const
+bool DocumentLifecycle::canRewindTo(LifecycleState nextState) const
 {
     // This transition is bogus, but we've whitelisted it anyway.
     if (s_deprecatedTransitionStack && m_state == s_deprecatedTransitionStack->from() && nextState == s_deprecatedTransitionStack->to())
         return true;
     return m_state == StyleClean
         || m_state == LayoutSubtreeChangeClean
         || m_state == AfterPerformLayout
         || m_state == LayoutClean
         || m_state == CompositingClean
         || m_state == PaintInvalidationClean
         || m_state == PaintClean;
 }
 
 #endif
 
-void DocumentLifecycle::advanceTo(State nextState)
+void DocumentLifecycle::advanceTo(LifecycleState nextState)
 {
     ASSERT_WITH_MESSAGE(canAdvanceTo(nextState),
         "Cannot advance document lifecycle from %s to %s.", stateAsDebugString(m_state), stateAsDebugString(nextState));
     m_state = nextState;
 }
 
-void DocumentLifecycle::ensureStateAtMost(State state)
+void DocumentLifecycle::ensureStateAtMost(LifecycleState state)
 {
     ASSERT(state == VisualUpdatePending || state == StyleClean || state == LayoutClean);
     if (m_state <= state)
         return;
     ASSERT_WITH_MESSAGE(canRewindTo(state),
         "Cannot rewind document lifecycle from %s to %s.", stateAsDebugString(m_state), stateAsDebugString(state));
     m_state = state;
 }
 
 bool DocumentLifecycle::throttlingAllowed() const
 {
     return s_allowThrottlingCount;
 }
 
 #if ENABLE(ASSERT)
 #define DEBUG_STRING_CASE(StateName) \
     case StateName: return #StateName
 
-const char* DocumentLifecycle::stateAsDebugString(const State state)
+const char* DocumentLifecycle::stateAsDebugString(const LifecycleState state)
 {
     switch (state) {
         DEBUG_STRING_CASE(Uninitialized);
         DEBUG_STRING_CASE(Inactive);
         DEBUG_STRING_CASE(VisualUpdatePending);
         DEBUG_STRING_CASE(InStyleRecalc);
         DEBUG_STRING_CASE(StyleClean);
         DEBUG_STRING_CASE(InLayoutSubtreeChange);
         DEBUG_STRING_CASE(LayoutSubtreeChangeClean);
         DEBUG_STRING_CASE(InPreLayout);
@@ skipping 12 matching lines @@
         DEBUG_STRING_CASE(Stopped);
         DEBUG_STRING_CASE(Disposed);
     }
 
     ASSERT_NOT_REACHED();
     return "Unknown";
 }
 #endif
 
 } // namespace blink