Merge m_didCallDispose and m_isMarkedForDeletion flags into one flag

Source/modules/webaudio/AudioSummingJunction.cpp

 /*
  * Copyright (C) 2012, 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:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 42 matching lines @@
 }
 
 void AudioSummingJunction::trace(Visitor* visitor)
 {
     visitor->trace(m_context);
 }
 
 void AudioSummingJunction::changedOutputs()
 {
     ASSERT(context()->isGraphOwner());
-#if ENABLE(OILPAN)
-    if (!m_renderingStateNeedUpdating) {
-#else
     if (!m_renderingStateNeedUpdating && canUpdateState()) {
-#endif
         context()->markSummingJunctionDirty(this);
         m_renderingStateNeedUpdating = true;
     }
 }
 
 void AudioSummingJunction::updateRenderingState()
 {
     ASSERT(context()->isAudioThread() && context()->isGraphOwner());
-#if ENABLE(OILPAN)
-    if (m_renderingStateNeedUpdating) {
-#else
     if (m_renderingStateNeedUpdating && canUpdateState()) {
-#endif
         // Copy from m_outputs to m_renderingOutputs.
         m_renderingOutputs.resize(m_outputs.size());
         unsigned j = 0;
         for (HashSet<AudioNodeOutput*>::iterator i = m_outputs.begin(); i != m_outputs.end(); ++i, ++j) {
             AudioNodeOutput* output = *i;
             m_renderingOutputs[j] = output;
             output->updateRenderingState();
         }
 
         didUpdate();
 
         m_renderingStateNeedUpdating = false;
     }
 }
 
 } // namespace blink
 
 #endif // ENABLE(WEB_AUDIO)