Merge 143565

Source/WebCore/Modules/webaudio/ChannelMergerNode.h

 /*
  * Copyright (C) 2010 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
@@ skipping 30 matching lines @@
     static PassRefPtr<ChannelMergerNode> create(AudioContext*, float sampleRate, unsigned numberOfInputs);
 
     // AudioNode
     virtual void process(size_t framesToProcess);
     virtual void reset();
 
     // Called in the audio thread (pre-rendering task) when the number of channels for an input may have changed.
     virtual void checkNumberOfChannelsForInput(AudioNodeInput*);
 
 private:
+    unsigned m_desiredNumberOfOutputChannels;
+
     virtual double tailTime() const OVERRIDE { return 0; }
     virtual double latencyTime() const OVERRIDE { return 0; }
 
     ChannelMergerNode(AudioContext*, float sampleRate, unsigned numberOfInputs);
 };
 
 } // namespace WebCore
 
 #endif // ChannelMergerNode_h