[Tizen] Add Tizen Murphy resource policy daemon integration

This patch includes Chromium side changes that are needed for integrating WebMediaPlayer with the Murphy resource policy daemon.
crosswalk-project · Sep 19, 2014 · 5ee6f9b · 5ee6f9b
1 parent 4c78a08
commit 5ee6f9b
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 0 deletions.
diff --git a/build/common.gypi b/build/common.gypi
@@ -2337,6 +2337,10 @@
 
     # Whether to allow building of the GPU-related isolates.
     'archive_gpu_tests%': 0,
+
+    # Flags to enable Murphy resource policy daemon integration on Tizen.
+    'tizen%': 0,
+    'enable_murphy%': 0,
   },
   'target_defaults': {
     'variables': {

diff --git a/build/linux/system.gyp b/build/linux/system.gyp
@@ -1054,5 +1054,27 @@
         }],
       ],
     },
+    {
+      'target_name': 'resource_manager',
+      'type': 'none',
+      'toolsets': ['host', 'target'],
+      'conditions': [
+        ['tizen==1 and enable_murphy==1', {
+          'direct_dependent_settings': {
+            'cflags': [
+              '<!@(<(pkg-config) --cflags murphy-common murphy-resource)',
+            ],
+          },
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-L --libs-only-other murphy-common murphy-resource)',
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l murphy-common  murphy-resource)',
+            ],
+          },
+        }],
+      ],
+    },
   ],
 }
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
@@ -93,6 +93,10 @@
 #include "content/browser/media/media_web_contents_observer.h"
 #endif
 
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+#include "xwalk/tizen/browser/media/media_webcontents_observer.h"
+#endif
+
 using base::TimeDelta;
 using blink::WebConsoleMessage;
 using blink::WebDragOperation;
@@ -223,6 +227,10 @@ RenderViewHostImpl::RenderViewHostImpl(
   media_web_contents_observer_.reset(new MediaWebContentsObserver(this));
 #endif
 
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+  media_webcontents_observer_.reset(new tizen::MediaWebContentsObserver(this));
+#endif
+
   unload_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind(
       &RenderViewHostImpl::OnSwappedOut, weak_factory_.GetWeakPtr(), true)));
 }

diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
@@ -35,6 +35,12 @@ struct ViewHostMsg_ShowPopup_Params;
 struct FrameMsg_Navigate_Params;
 struct ViewMsg_PostMessage_Params;
 
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+namespace tizen {
+class MediaWebContentsObserver;
+}
+#endif
+
 namespace base {
 class ListValue;
 }
@@ -544,6 +550,11 @@ class CONTENT_EXPORT RenderViewHostImpl
   scoped_ptr<MediaWebContentsObserver> media_web_contents_observer_;
 #endif
 
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+  // Manages all the media player managers and forwards IPCs to them.
+  scoped_ptr<tizen::MediaWebContentsObserver> media_webcontents_observer_;
+#endif
+
   // Used to swap out or shutdown this RVH when the unload event is taking too
   // long to execute, depending on the number of active views in the
   // SiteInstance.

diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
@@ -71,3 +71,7 @@
 #include "content/common/gin_java_bridge_messages.h"
 #include "content/common/media/media_player_messages_android.h"
 #endif  // defined(OS_ANDROID)
+
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+#include "xwalk/tizen/common/media/media_player_messages.h"
+#endif
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
@@ -1806,6 +1806,26 @@
         'browser/power_save_blocker_x11.cc',
       ],
     }],
+    ['tizen==1 and enable_murphy==1', {
+      'sources': [
+        '<(DEPTH)/xwalk/tizen/browser/media/browser_mediaplayer_manager.cc',
+        '<(DEPTH)/xwalk/tizen/browser/media/browser_mediaplayer_manager.h',
+        '<(DEPTH)/xwalk/tizen/browser/media/media_webcontents_observer.cc',
+        '<(DEPTH)/xwalk/tizen/browser/media/media_webcontents_observer.h',
+        '<(DEPTH)/xwalk/tizen/browser/media/murphy_mainloop.cc',
+        '<(DEPTH)/xwalk/tizen/browser/media/murphy_mainloop.h',
+        '<(DEPTH)/xwalk/tizen/browser/media/murphy_resource.cc',
+        '<(DEPTH)/xwalk/tizen/browser/media/murphy_resource.h',
+        '<(DEPTH)/xwalk/tizen/browser/media/murphy_resource_manager.cc',
+        '<(DEPTH)/xwalk/tizen/browser/media/murphy_resource_manager.h',
+      ],
+      'dependencies': [
+        '../build/linux/system.gyp:resource_manager',
+      ],
+      'export_dependent_settings': [
+        '../build/linux/system.gyp:resource_manager',
+      ],
+    }],
     ['os_bsd==1', {
       'sources/': [
         ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],

diff --git a/content/content_common.gypi b/content/content_common.gypi
@@ -843,6 +843,11 @@
         '<(DEPTH)/third_party/khronos',
       ],
     }],
+    ['tizen==1 and enable_murphy==1', {
+      'sources': [
+        '<(DEPTH)/xwalk/tizen/common/media/media_player_messages.h',
+      ],
+    }],
     ['OS=="win" and directxsdk_exists=="True"', {
       'actions': [
       {

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
@@ -891,6 +891,14 @@
         'renderer/media/crypto/renderer_cdm_manager.h',
       ],
     }],
+    ['tizen==1 and enable_murphy==1', {
+      'sources': [
+        '<(DEPTH)/xwalk/tizen/renderer/media/mediaplayer_impl.cc',
+        '<(DEPTH)/xwalk/tizen/renderer/media/mediaplayer_impl.h',
+        '<(DEPTH)/xwalk/tizen/renderer/media/renderer_mediaplayer_manager.cc',
+        '<(DEPTH)/xwalk/tizen/renderer/media/renderer_mediaplayer_manager.h',
+      ],
+    }],
   ],
   'target_conditions': [
     ['OS=="android"', {

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
@@ -144,6 +144,11 @@
 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
 #endif
 
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+#include "xwalk/tizen/renderer/media/renderer_mediaplayer_manager.h"
+#include "xwalk/tizen/renderer/media/mediaplayer_impl.h"
+#endif
+
 using blink::WebContextMenuData;
 using blink::WebData;
 using blink::WebDataSource;
@@ -443,6 +448,9 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id)
 #endif
 #if defined(VIDEO_HOLE)
       contains_media_player_(false),
+#endif
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+      media_player_manager_(NULL),
 #endif
       geolocation_dispatcher_(NULL),
       push_messaging_dispatcher_(NULL),
@@ -1513,11 +1521,29 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
                  static_cast<RenderFrame*>(this)),
       RenderThreadImpl::current()->GetAudioRendererMixerManager()->CreateInput(
           render_view_->routing_id_, routing_id_));
+
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+  tizen::MediaPlayerImpl* media_player = new tizen::MediaPlayerImpl(
+      frame, client, weak_factory_.GetWeakPtr(),
+      GetTizenMediaPlayerManager(), params);
+  return media_player;
+#endif
+
   return new WebMediaPlayerImpl(frame, client, weak_factory_.GetWeakPtr(),
                                 params);
 #endif  // defined(OS_ANDROID)
 }
 
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+tizen::RendererMediaPlayerManager*
+RenderFrameImpl::GetTizenMediaPlayerManager() {
+  if (!media_player_manager_)
+    media_player_manager_ = new tizen::RendererMediaPlayerManager(this);
+
+  return media_player_manager_;
+}
+#endif
+
 blink::WebContentDecryptionModule*
 RenderFrameImpl::createContentDecryptionModule(
     blink::WebLocalFrame* frame,

diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
@@ -56,6 +56,12 @@ class Range;
 class Rect;
 }
 
+#if defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+namespace tizen {
+class RendererMediaPlayerManager;
+}
+#endif
+
 namespace content {
 
 class ChildFrameCompositingHelper;
@@ -591,6 +597,8 @@ class CONTENT_EXPORT RenderFrameImpl
       blink::WebMediaPlayerClient* client);
 
   RendererMediaPlayerManager* GetMediaPlayerManager();
+#elif defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+  tizen::RendererMediaPlayerManager* GetTizenMediaPlayerManager();
 #endif
 
 #if defined(ENABLE_BROWSER_CDMS)
@@ -675,6 +683,8 @@ class CONTENT_EXPORT RenderFrameImpl
   // real media player in the browser process. It's okay to use a raw pointer
   // since it's a RenderFrameObserver.
   RendererMediaPlayerManager* media_player_manager_;
+#elif defined(OS_TIZEN) && defined(ENABLE_MURPHY)
+  tizen::RendererMediaPlayerManager* media_player_manager_;
 #endif
 
 #if defined(ENABLE_BROWSER_CDMS)