[meego-commits] 7283: Changes to MeeGo:1.0:Netbook:Update:Testing/chrome-meego-extension

[ningxin hu]

Hi,
I have made the following changes to chrome-meego-extension in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.

Thank You,
ningxin hu

[This message was auto-generated]

---

Request #7283:

  submit:   home:nhu:branches:MeeGo:1.0:Netbook:Update:Testing/chrome-meego-extension(r2)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/chrome-meego-extension


Message:
    Fix for chromium-lib update for BMC#4935

State:   new          2010-09-02T20:12:26 nhu
Comment: None



changes files:
--------------
--- chrome-meego-extension.changes
+++ chrome-meego-extension.changes
@@ -0,0 +1,3 @@
+* Wed Sep 1 2010 Ningxin Hu <ningxin.hu at intel.com> - 0.1.0
+- Update according to BMC#4935 chromium update to svn55059
+

new:
----
  pipe-hup-cpu-hog-fix.patch

spec files:
-----------
--- chrome-meego-extension.spec
+++ chrome-meego-extension.spec
@@ -8,6 +8,7 @@
 Source0: %{name}-%{version}.tar.bz2
 Source1: chromium-browser-ext.sh
 Patch0: chromium-support.patch
+Patch1: pipe-hup-cpu-hog-fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
@@ -29,6 +30,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
 %build
 pushd plugin
 ../tools/gyp/gyp --depth=`pwd` -fmake

other changes:
--------------

++++++ pipe-hup-cpu-hog-fix.patch (new)
--- pipe-hup-cpu-hog-fix.patch
+++ pipe-hup-cpu-hog-fix.patch
+diff --git a/plugin/src/MeeGoPluginAPI.cpp b/plugin/src/MeeGoPluginAPI.cpp
+index ee099e3..7a09353 100644
+--- a/plugin/src/MeeGoPluginAPI.cpp
++++ b/plugin/src/MeeGoPluginAPI.cpp
+@@ -145,7 +145,6 @@ input_io_func (GIOChannel              *source,
+       
+       status = pipe_receive (source, G_TYPE_UINT, &command,
+                              G_TYPE_INVALID);
+-      
+       if (status == G_IO_STATUS_NORMAL)
+         {
+           this_->processCommand (command);
+@@ -168,25 +167,33 @@ input_io_func (GIOChannel              *source,
+   if (condition & G_IO_HUP)
+     {
+       /* Don't warn on this, this is fine */
+-      /*g_warning ("Hung up");*/
++      //g_warning ("Hung up");
++      this_->closePipe();
++      this_->openPipe();
+       result = FALSE;
+     }
+ 
+   if (condition & G_IO_ERR)
+     {
+       g_warning ("Error");
++      this_->closePipe();
++      this_->openPipe();
+       result = FALSE;
+     }
+ 
+   if (condition & G_IO_NVAL)
+     {
+       g_warning ("Invalid request");
++      this_->closePipe();
++      this_->openPipe();
+       result = FALSE;
+     }
+ 
+   if (condition & ~(G_IO_PRI | G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL))
+     {
+       g_warning ("Unexpected IO condition");
++      this_->closePipe();
++      this_->openPipe();
+       result = FALSE;
+     }
+ 
+@@ -388,7 +395,7 @@ void MeeGoPluginAPI::openPipe ()
+   g_io_channel_set_buffered (m_input, FALSE);
+   g_io_channel_set_close_on_unref (m_input, TRUE);
+   m_watch_id = g_io_add_watch (m_input,
+-                               GIOCondition(G_IO_IN),
++                               GIOCondition(G_IO_IN | G_IO_HUP | G_IO_PRI | G_IO_ERR | G_IO_NVAL),
+                                (GIOFunc)input_io_func,
+                                this);
+ #ifdef EXTENSION_DEBUG
+diff --git a/plugin/src/MeeGoPluginAPI.h b/plugin/src/MeeGoPluginAPI.h
+index 4f8cd09..abfb229 100644
+--- a/plugin/src/MeeGoPluginAPI.h
++++ b/plugin/src/MeeGoPluginAPI.h
+@@ -43,6 +43,9 @@ public:
+     // IPC
+     void processCommand(guint command);
+     void doStartupCmd();
++
++    void openPipe();
++    void closePipe();
+ private:
+     FB::AutoPtr<FB::BrowserHostWrapper> m_host;
+ 
+@@ -50,9 +53,6 @@ private:
+     gchar* m_input_file;
+     GIOChannel *m_input;
+     guint m_watch_id;
+-
+-    void openPipe();
+-    void closePipe();
+ };
+ 
+ #endif // H_MeeGoPluginAPI