[meego-commits] 24182: Changes to MeeGo:1.2:oss/meego-tv-browser
jieyang
no_reply at build.meego.com
Fri Sep 30 03:45:29 UTC 2011
Hi,
I have made the following changes to meego-tv-browser in project MeeGo:1.2:oss. Please review and accept ASAP.
Thank You,
jieyang
[This message was auto-generated]
---
Request #24182:
submit: MeeGo:1.2:oss:Testing/meego-tv-browser -> MeeGo:1.2:oss/meego-tv-browser
Message:
forward
State: new 2011-09-29T20:35:01 jieyang
Comment: None
changes files:
--------------
--- meego-tv-browser.changes
+++ meego-tv-browser.changes
@@ -0,0 +1,7 @@
+* Thu Sep 29 2011 Shouqun Liu <shouqun.liu at intel.com> - 12.0.712.0
+- Update TV browser with some bug fix, including:
+ 1, Update the API to the new version of UMMS and fix the playstate error bug
+ 2, Set the correct cursor type on toolbar mode
+ 3, Remove the double-click to zoom code
+ 4, Fix a memory leakage in data copy paint[HTML5]
+
spec files:
-----------
other changes:
--------------
++++++ chromium-qt.patch
--- chromium-qt.patch
+++ chromium-qt.patch
@@ -41941,10 +41941,10 @@
+#endif // MEEGOTHEMEDIMAGEPROVIDER_H
diff --git a/chrome/browser/ui/meegotouch/browser_toolbar_qt.cc b/chrome/browser/ui/meegotouch/browser_toolbar_qt.cc
new file mode 100644
-index 0000000..2779f6b
+index 0000000..4363b46
--- /dev/null
+++ b/chrome/browser/ui/meegotouch/browser_toolbar_qt.cc
-@@ -0,0 +1,386 @@
+@@ -0,0 +1,385 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -42137,7 +42137,6 @@
+ QDeclarativeView *declariveView = toolbar_->window()->DeclarativeView();
+ QWidget *parent = reinterpret_cast<QWidget*>(declariveView->parent());
+
-+ qDebug()<<"setCursorPosition X and Y:"<< parent->geometry().x() << " "<<parent->geometry().y();
+ QCursor::setPos(parent->geometry().x() + x, parent->geometry().y() + y);
+ }
+
@@ -42499,10 +42498,10 @@
+}
diff --git a/chrome/browser/ui/meegotouch/browser_window_qt.cc b/chrome/browser/ui/meegotouch/browser_window_qt.cc
new file mode 100644
-index 0000000..33df224
+index 0000000..c0c3149
--- /dev/null
+++ b/chrome/browser/ui/meegotouch/browser_window_qt.cc
-@@ -0,0 +1,1036 @@
+@@ -0,0 +1,1017 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -42695,12 +42694,9 @@
+ void HandleOkKeyPressed() {
+ QPoint curPosGlobal = QCursor::pos();
+ QPoint curPosWidget = window_->window()->mapFromGlobal(curPosGlobal);
-+ qDebug() << "Coordination to Widget is " << curPosWidget;
+ QWidget *dest = QApplication::widgetAt(curPosGlobal);
-+ qDebug() << "Target Widget:" <<(int) dest;
+
+ QWidget *targetPluginWidget = window_->GetPluginContainerOnPoint(curPosWidget);
-+ qDebug() << "Target Plugin Widget:" <<(int)targetPluginWidget;
+ if (targetPluginWidget) {
+ QMouseEvent *pressEvent=new QMouseEvent(QEvent::MouseButtonPress,curPosWidget,Qt::LeftButton,Qt::LeftButton,Qt::NoModifier);
+ QApplication::sendEvent(targetPluginWidget,pressEvent);
@@ -42719,7 +42715,6 @@
+ void SimulateMouseMoveEvent() {
+ QPoint curPosGlobal = QCursor::pos();
+ QPoint curPosWidget = window_->window()->mapFromGlobal(curPosGlobal);
-+ qDebug() << " Send Mouse Move, Coordination to Widget is " << curPosWidget;
+ QWidget *dest = QApplication::widgetAt(curPosGlobal);
+ if (dest){
+ QMouseEvent *pressEvent=new QMouseEvent(QEvent::MouseMove,
@@ -42768,7 +42763,6 @@
+ curPosGlobal = QCursor::pos();
+ QWidget *dest = QApplication::widgetAt(curPosGlobal);
+ if (dest){
-+ qDebug()<<"To Send WheelEvent";
+ wheelEvent = new QWheelEvent(wheelPostion, wheelDelta, wheelButtons, wheelKeyboard, wheelOrientation);
+ QApplication::sendEvent(dest, wheelEvent);
+ }
@@ -42779,7 +42773,6 @@
+ QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+
+ QPoint position = mouseEvent->pos();
-+ qDebug()<<"Mouse Position: "<< position.x() <<"x"<<position.y();
+ }
+
+ bool eventFilter(QObject *obj, QEvent *event)
@@ -42842,23 +42835,18 @@
+ //the directions key pressed
+ switch (key) {
+ case REMOTE_UP:
-+ qDebug() <<"Up";
+ adjust+=QPoint(0,-1);
+ break;
+ case REMOTE_DOWN:
-+ qDebug() <<"Down";
+ adjust+=QPoint(0,1);
+ break;
+ case REMOTE_LEFT:
-+ qDebug() <<"Left";
+ adjust+=QPoint(-1,0);
+ break;
+ case REMOTE_RIGHT:
-+ qDebug() <<"Right";
+ adjust+=QPoint(1,0);
+ break;
+ default:
-+ qDebug() << "Not a special key" ;
+ return QObject::eventFilter(obj, event);
+ }
+
@@ -42880,16 +42868,13 @@
+ break;
+ }
+ }
-+ qDebug() <<"Found " <<repeat <<" repeats" ;
+ bufpos = (bufpos + 1) % KC_BUF_SIZE;
+ range = repeat * 2;
+ adjust *= range;
+ QPoint curPosGlobal = QCursor::pos();
+ QPoint adjPosGlobal = curPosGlobal + adjust;
+ const QRect &geo = window_->window()->geometry();
-+ qDebug() << "Window Bounds is " << geo;
+ if ( geo.contains(adjPosGlobal) ) {
-+ qDebug() << "Simulate a mouse move" <<adjust ;
+ QCursor::setPos(adjPosGlobal);
+ //send mouse move event
+ SimulateMouseMoveEvent();
@@ -42910,13 +42895,11 @@
+ }
+
+ inline void SetFullscreenState() {
-+ qDebug()<<"SetFullscreenState";
+ window_->SetFullscreenMode();
+ }
+
+protected slots:
+ void onHoverMove() {
-+ //qDebug()<<"onHoverMove";
+
+ QPoint curPosGlobal = QCursor::pos();
+ QPoint curPosWidget = window_->window()->mapFromGlobal(curPosGlobal);
@@ -42924,7 +42907,6 @@
+ lastCursor = currentCursor;
+ currentCursor = curPosWidget;
+
-+ qDebug()<<"Cursor Position:" <<lastCursor.x() <<"x"<<lastCursor.y()<<" "<<currentCursor.x()<<"x"<<currentCursor.y();;
+ //if is fullscreen state
+ if (GetFullscreenState()) {
+ if (currentCursor.y() < 5) {
@@ -42962,7 +42944,6 @@
+ }
+
+ void updateAddressBar() {
-+ qDebug()<<"Timer fired, change the fullscreen state";
+ window_->SetFullscreenModeWithState(true); //toggle fullscreen
+
+ mouseTimer.stop();
@@ -43464,7 +43445,6 @@
+
+void BrowserWindowQt::FocusTabContents()
+{
-+ qDebug()<<"BrowserWindowMtf::FocusTabContents";
+ TabContents* tab_content = browser_->GetSelectedTabContents();
+ if (tab_content != NULL)
+ tab_content->Focus();
@@ -61500,10 +61480,10 @@
virtual void AcceleratedCompositingActivated(bool activated) = 0;
diff --git a/content/browser/renderer_host/rwhv_qt_widget.cc b/content/browser/renderer_host/rwhv_qt_widget.cc
new file mode 100644
-index 0000000..1369639
+index 0000000..62f475e
--- /dev/null
+++ b/content/browser/renderer_host/rwhv_qt_widget.cc
-@@ -0,0 +1,2313 @@
+@@ -0,0 +1,2318 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -61957,17 +61937,20 @@
+{
+ //hostView()->OnMoveEvent(aEvent);
+ WebKit::WebMouseEvent mouseMoveEvent;
++
++ QPointF thisPoint = GetViewportItem()->mapFromParent(event->scenePos());
++
+ mouseMoveEvent.modifiers = 0;
-+ mouseMoveEvent.x = static_cast<int>(event->scenePos().x());
-+ mouseMoveEvent.y = static_cast<int>(event->scenePos().y());
++ mouseMoveEvent.x = static_cast<int>(thisPoint.x());
++ mouseMoveEvent.y = static_cast<int>(thisPoint.y());
+ mouseMoveEvent.windowX = mouseMoveEvent.x;
+ mouseMoveEvent.windowY = mouseMoveEvent.y;
+ mouseMoveEvent.globalX = static_cast<int>(event->pos().x());
+ mouseMoveEvent.globalY = static_cast<int>(event->pos().y());
-+
++
+ mouseMoveEvent.type = WebKit::WebInputEvent::MouseMove;
+ mouseMoveEvent.button = WebKit::WebMouseEvent::ButtonNone;
-+
++
+ hostView()->host_->ForwardMouseEvent(mouseMoveEvent);
+
+ return QGraphicsWidget::hoverMoveEvent(event);
@@ -62480,24 +62463,25 @@
+ }
+ }
+
-+ qint64 timestamp = QDateTime::currentMSecsSinceEpoch();
-+ if (timestamp - m_dbclkHackTimeStamp < 350) {
-+ // we may hit a double tap
-+ qreal length = QLineF(event->pos(), m_dbclkHackPos).length();
-+ if (length < 40) {
-+ DLOG(INFO) << "WE HIT A DOUBLE CLICK " << length << std::endl;
(815 more lines skipped)
More information about the MeeGo-commits
mailing list