[meego-commits] 9470: Changes to MeeGo:1.1:IVI:Update:Testing/fennec-qt

[Roger WANG]

Hi,
I have made the following changes to fennec-qt in project MeeGo:1.1:IVI:Update:Testing. Please review and accept ASAP.

Thank You,
Roger WANG

[This message was auto-generated]

---

Request #9470:

  submit:   home:wwang29:branches:MeeGo:1.1:IVI:Update:Testing/fennec-qt(r2)(cleanup) -> MeeGo:1.1:IVI:Update:Testing/fennec-qt


Message:
    * Thu Nov 11 21:42:52 +0800 2010 Roger Wang <roger.wang at intel.com> - 2.0b1pre0908.3
- Fixes for IVI only: BMC#7561 - location bar and webpage NOT full screen
- diverge from core package; IVI ONLY, do NOT submit this to Core.

State:   new          2010-11-13T16:56:52 wwang29
Comment: None



changes files:
--------------
--- fennec-qt.changes
+++ fennec-qt.changes
@@ -0,0 +1,4 @@
+* Thu Nov 11 21:42:52 +0800 2010 Roger Wang <roger.wang at intel.com> - 2.0b1pre0908.3
+- Fixes for IVI only: BMC#7561 - location bar and webpage NOT full screen
+- diverge from core package; IVI ONLY, do NOT submit this to Core.
+

new:
----
  bmc7561-mb.patch
  bmc7561-mc.patch

spec files:
-----------
--- fennec-qt.spec
+++ fennec-qt.spec
@@ -8,7 +8,7 @@
 
 Name:       fennec-qt
 Summary:    Fennec Mobile Web Browser with Qt/MeeGo Touch
-Version:    2.0b1pre0908.2
+Version:    2.0b1pre0908.3
 Release:    1
 Group:      Applications/Internet
 License:    MPLv1.1 or GPLv2+ or LGPLv2+
@@ -24,6 +24,8 @@
 Patch1:     BMO589389_enable_plugins.patch
 Patch2:     arm-build.patch
 Patch3:     BMO597316_overwrite_wmode_param.patch
+Patch4:     bmc7561-mc.patch
+Patch5:     bmc7561-mb.patch
 Requires:   libmeegotouch
 Requires:   libcontentaction
 BuildRequires:  pkgconfig(gstreamer-0.10)
@@ -68,6 +70,8 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1 -d mobile
 
 # >> setup
 cp %{SOURCE3} .mozconfig

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

++++++ bmc7561-mb.patch (new)
--- bmc7561-mb.patch
+++ bmc7561-mb.patch
+diff --git a/chrome/content/browser.js b/chrome/content/browser.js
+--- a/chrome/content/browser.js
++++ b/chrome/content/browser.js
+@@ -56,7 +56,7 @@
+   return Browser.selectedBrowser;
+ }
+ 
+-const kDefaultBrowserWidth = 800;
++const kDefaultBrowserWidth = 700;
+ 
+ // Override sizeToContent in the main window. It breaks things (bug 565887)
+ window.sizeToContent = function() {
+@@ -321,9 +321,9 @@
+ #ifndef MOZ_PLATFORM_MAEMO
+   case q:
+     if (Util.isPortrait())
+-      window.top.resizeTo(800,480);
++      window.top.resizeTo(700,480);
+     else
+-      window.top.resizeTo(480,800);
++      window.top.resizeTo(480,700);
+     break;
+ #endif
+   case z:
+@@ -2734,7 +2734,7 @@
+     // XXX: We don't know the size of the browser at this time and we can't fallback
+     // to contentWindow.innerWidth and .innerHeight. The viewport meta data is not
+     // even set yet. So fallback to something sane for now.
+-    this._chromeTab.updateThumbnail(this._browser, 800, 500);
++    this._chromeTab.updateThumbnail(this._browser, 700, 480);
+   },
+ 
+   toString: function() {
+diff --git a/chrome/content/browser.xul b/chrome/content/browser.xul
+--- a/chrome/content/browser.xul
++++ b/chrome/content/browser.xul
+@@ -61,7 +61,8 @@
+         chromedir="&locale.dir;"
+         title="&brandShortName;"
+ #ifdef MOZ_PLATFORM_MAEMO
+-        sizemode="fullscreen"
++        width="700"
++        height="480"
+ #else
+         width="800"
+         height="500"

++++++ bmc7561-mc.patch (new)
--- bmc7561-mc.patch
+++ bmc7561-mc.patch
+diff --git a/widget/src/qt/mozqwidget.h b/widget/src/qt/mozqwidget.h
+--- a/widget/src/qt/mozqwidget.h
++++ b/widget/src/qt/mozqwidget.h
+@@ -239,7 +239,7 @@
+         mTopLevelWidget->setParentItem(this);
+         mTopLevelWidget->installEventFilter(this);
+         mStatusBar = new MStatusBar();
+-        mStatusBar->appear();
++        //mStatusBar->appear();
+         connect(mStatusBar, SIGNAL(appeared()), this, SLOT(CheckTopLevelSize()));
+         connect(mStatusBar, SIGNAL(disappeared()), this, SLOT(CheckTopLevelSize()));
+         MInputMethodState *inputMethodState = MInputMethodState::instance();
+@@ -260,6 +260,8 @@
+         if (e->type() == QEvent::GraphicsSceneResize ||
+             e->type() == QEvent::GraphicsSceneMove) {
+ 
++            if (e->type() == QEvent::GraphicsSceneResize)
++                mCurrentSize = ((QGraphicsSceneResizeEvent*)e)->newSize();
+             //Do this in next event loop, or we are in recursion!
+             QTimer::singleShot(0, this, SLOT(CheckTopLevelSize()));
+         }
+@@ -340,6 +342,7 @@
+     virtual void resizeEvent(QResizeEvent* aEvent)
+     {
+         setSceneRect(viewport()->rect());
++        mEventHandler.handleResizeEvent(aEvent, mTopLevelWidget);
+         MWindow::resizeEvent(aEvent);
+     }
+ 
+diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
+--- a/widget/src/qt/nsWindow.cpp
++++ b/widget/src/qt/nsWindow.cpp
+@@ -2647,6 +2647,9 @@
+ NS_IMETHODIMP
+ nsWindow::Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
+ {
++    LOG(("nsWindow::Resize [%p] %d %d\n", (void *)this,
++         aWidth, aHeight));
++
+     mBounds.width = aWidth;
+     mBounds.height = aHeight;
+