Unreviewed buildfix after r166441 and r166443.
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Mar 2014 07:13:52 +0000 (07:13 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Mar 2014 07:13:52 +0000 (07:13 +0000)
Source/WebCore:

* CMakeLists.txt: Add platform/audio/AudioHardwareListener.cpp.

Source/WebKit2:

Missing PLATFORM(COCOA) guards added.

* WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
(WebKit::NPRuntimeObjectMap::evaluate):
* WebProcess/Plugins/PluginProxy.cpp:
* WebProcess/Plugins/PluginProxy.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@166451 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp
Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
Source/WebKit2/WebProcess/Plugins/PluginProxy.h

index 4546035..7f9f4e3 100644 (file)
@@ -1833,6 +1833,7 @@ set(WebCore_SOURCES
     platform/audio/AudioChannel.cpp
     platform/audio/AudioDSPKernelProcessor.cpp
     platform/audio/AudioFIFO.cpp
+    platform/audio/AudioHardwareListener.cpp
     platform/audio/AudioPullFIFO.cpp
     platform/audio/AudioResampler.cpp
     platform/audio/AudioResamplerKernel.cpp
index e6e7f61..3b956af 100644 (file)
@@ -1,3 +1,9 @@
+2014-03-28  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        Unreviewed buildfix after r166441 and r166443.
+
+        * CMakeLists.txt: Add platform/audio/AudioHardwareListener.cpp.
+
 2014-03-28  Javier Fernandez  <jfernandez@igalia.com>
 
         [CSS Grid Layout] The 'auto' height must be adapted to the item's margin.
index 8386c91..8892c8b 100644 (file)
@@ -1,3 +1,14 @@
+2014-03-28  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        Unreviewed buildfix after r166441 and r166443.
+
+        Missing PLATFORM(COCOA) guards added.
+
+        * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
+        (WebKit::NPRuntimeObjectMap::evaluate):
+        * WebProcess/Plugins/PluginProxy.cpp:
+        * WebProcess/Plugins/PluginProxy.h:
+
 2014-03-28  Stephanie Lewis  <slewis@apple.com>
 
         Don't prevent AppSleep from sync messages.
index f9392e1..035656c 100644 (file)
@@ -190,12 +190,14 @@ bool NPRuntimeObjectMap::evaluate(NPObject* npObject, const String& scriptString
     if (!globalObject)
         return false;
 
+#if PLATFORM(COCOA)
     if (m_pluginView && !m_pluginView->isBeingDestroyed()) {
         if (Page* page = m_pluginView->frame()->page()) {
             if (m_pluginView->audioHardwareActivity() != WebCore::AudioHardwareActivityType::IsInactive)
                 page->pageThrottler().pluginDidEvaluateWhileAudioIsPlaying();
         }
     }
+#endif
 
     ExecState* exec = globalObject->globalExec();
     
index c765183..7d9c368 100644 (file)
@@ -709,11 +709,13 @@ PassRefPtr<WebCore::SharedBuffer> PluginProxy::liveResourceData() const
 {
     return 0;
 }
-    
+
+#if PLATFORM(COCOA)
 WebCore::AudioHardwareActivityType PluginProxy::audioHardwareActivity() const
 {
     return m_connection->audioHardwareActivity();
 }
+#endif
 
 } // namespace WebKit
 
index 4f3d58e..4937e5f 100644 (file)
@@ -138,8 +138,10 @@ private:
     virtual bool performDictionaryLookupAtLocation(const WebCore::FloatPoint&) override { return false; }
 
     virtual String getSelectionString() const override { return String(); }
-    
+
+#if PLATFORM(COCOA)
     virtual WebCore::AudioHardwareActivityType audioHardwareActivity() const override;
+#endif
 
     float contentsScaleFactor();
     bool needsBackingStore() const;