[meego-commits] 24904: Changes to devel:tv:1.2/meego-tv-browser

[Shouqun Liu]

Hi,
I have made the following changes to meego-tv-browser in project devel:tv:1.2. Please review and accept ASAP.

Thank You,
Shouqun Liu

[This message was auto-generated]

---

Request #24904:

  submit:   home:liushouqun:branches:devel:tv:1.2/meego-tv-browser(r4)(cleanup) -> devel:tv:1.2/meego-tv-browser


Message:
    None

State:   new          2012-06-10T18:03:44 liushouqun
Comment: None



new:
----
  hotfix-14777-14814.patch

spec files:
-----------
--- meego-tv-browser.spec
+++ meego-tv-browser.spec
@@ -1,6 +1,6 @@
 # see chrome/VERSION
 %global chromium_version 15.0.874.100
-%global weekly_version 2012WW13 
+%global weekly_version 2012WW23 
 
 %global noisy 1
 %global selinux 0
@@ -23,6 +23,7 @@
 Patch1:         WebKit.patch
 Patch2:         fix_build_webcore_stograge_idb_sqlite.patch
 Patch3:         0001-optimization-for-apply_kernel_interp.patch 
+Patch4:         hotfix-14777-14814.patch
 
 Provides:       chromium-based-tv-browser
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -71,6 +72,7 @@
 git apply %{PATCH0}
 git apply %{PATCH1} --directory third_party/WebKit
 git apply %{PATCH2} --directory third_party/WebKit
+git apply %{PATCH4}
 %patch3 -p1
 
 # Scrape out incorrect optflags and hack in the correct ones  

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

++++++ hotfix-14777-14814.patch (new)
--- hotfix-14777-14814.patch
+++ hotfix-14777-14814.patch
+diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
+index 7b26e51..92fd301 100644
+--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
++++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
+@@ -409,8 +409,8 @@ WrenchMenuModel::WrenchMenuModel()
+ #if !defined(OS_CHROMEOS)
+ void WrenchMenuModel::Build() {
+   AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
+-  AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
+-  AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
++  //AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
++  //AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
+ 
+   bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));
+   AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
+diff --git a/tv_webapi/src/video/OipfAPI.h b/tv_webapi/src/video/OipfAPI.h
+index 67d7240..923e22a 100644
+--- a/tv_webapi/src/video/OipfAPI.h
++++ b/tv_webapi/src/video/OipfAPI.h
+@@ -79,7 +79,7 @@ public:
+   }
+ 
+ 	int64_t GetPosition() {
+-    this->umms->GetPosition();
++    return this->umms->GetPosition();
+   }
+ 
+ 	void SetPlaybackRate(const double& rate) {
+@@ -87,7 +87,7 @@ public:
+   }
+ 
+ 	double GetPlaybackRate() {
+-    this->umms->GetPlaybackRate();
++    return this->umms->GetPlaybackRate();
+   }
+ 
+ 	void SetVolume(const int32_t& volume) {
+@@ -95,7 +95,7 @@ public:
+   }
+ 
+ 	int32_t GetVolume() {
+-    this->umms->GetVolume();
++    return this->umms->GetVolume();
+   }
+ 
+ 	void SetWindowId(const double& win_id) {
+@@ -108,43 +108,43 @@ public:
+   }
+ 	
+   int64_t GetBufferedTime() {
+-    this->umms->GetBufferedTime();
++   return this->umms->GetBufferedTime();
+   }
+ 
+ 	int64_t GetBufferedBytes() {
+-    this->umms->GetBufferedBytes();
++    return this->umms->GetBufferedBytes();
+   }
+ 
+ 	int64_t GetMediaSizeTime() {
+-    this->umms->GetMediaSizeTime();
++    return this->umms->GetMediaSizeTime();
+   }
+ 
+ 	int64_t GetMediaSizeBytes() {
+-    this->umms->GetMediaSizeBytes();
++    return this->umms->GetMediaSizeBytes();
+   }
+ 
+ 	bool HasVideo() {
+-    this->umms->HasVideo();
++   return this->umms->HasVideo();
+   }
+ 
+ 	bool HasAudio() {
+-    this->umms->HasAudio();
++   return this->umms->HasAudio();
+   }
+ 
+ 	bool IsStreaming() {
+-    this->umms->IsStreaming();
++   return this->umms->IsStreaming();
+   }
+ 
+ 	bool IsSeekable() {
+-    this->umms->IsSeekable();
++   return this->umms->IsSeekable();
+   }
+ 
+ 	bool SupportFullscreen() {
+-    this->umms->SupportFullscreen();
++   return this->umms->SupportFullscreen();
+   }
+ 
+ 	int32_t GetPlayerState() {
+-    this->umms->GetPlayerState();
++   return this->umms->GetPlayerState();
+   }
+ 
+ 	void Reply() {