Unreviewed build fix.

        [Qt] Roll-out r54281 because it broke the build on the Qt Release bot.



git-svn-id: svn://svn.chromium.org/blink/trunk@54284 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2010-02-03  Andras Becsi  <abecsi@webkit.org>
+
+        Unreviewed build fix.
+
+        [Qt] Roll-out r54281 because it broke the build on the Qt Release bot.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::GraphicsLayerQtImpl::State::State):
+        (WebCore::GraphicsLayerQtImpl::GraphicsLayerQtImpl):
+        (WebCore::GraphicsLayerQtImpl::setBaseTransform):
+        (WebCore::GraphicsLayerQtImpl::drawContents):
+        (WebCore::GraphicsLayerQtImpl::notifyChange):
+        (WebCore::GraphicsLayerQtImpl::flushChanges):
+        (WebCore::GraphicsLayerQt::setNeedsDisplayInRect):
+        (WebCore::applyTimingFunction):
+        (WebCore::webkitAnimationToQtAnimationValue):
+        (WebCore::AnimationQtBase::updateState):
+        (WebCore::AnimationQt::updateCurrentTime):
+        (WebCore::TransformAnimationQt::TransformAnimationQt):
+        (WebCore::TransformAnimationQt::~TransformAnimationQt):
+        (WebCore::TransformAnimationQt::applyFrame):
+        (WebCore::TransformAnimationQt::updateState):
+        (WebCore::OpacityAnimationQt::updateState):
+        (WebCore::GraphicsLayerQt::pauseAnimation):
+
 2010-02-02  Bryan Yeung  <bryeung@google.com>
 
         Reviewed by Darin Adler.
@@ -17,24 +42,6 @@
         * dom/Element.cpp:
         (WebCore::Element::baseURI):
 
-2010-02-03  No'am Rosenthal  <noam.rosenthal@nokia.com>
-
-        Reviewed by Laszlo Gombos.
-
-        [Qt] Tuning and optimizations to GraphicsLayerQt. Reduce unnecessary
-        recaching, remove QTimer::singleShot and QPixmap::scaled, more
-        accurate strategy of handling transform operation blends. Rotating a
-        bordered-table, for example, now runs at 50FPS instead of 40FPS on Maemo5.
-
-        https://bugs.webkit.org/show_bug.cgi?id=34062
-
-        This is tested by https://bugs.webkit.org/show_bug.cgi?id=34450, fps measurements.
-
-        * platform/graphics/qt/GraphicsLayerQt.cpp:
-        (WebCore::GraphicsLayerQtImpl::flushChanges): Fine-tune caching
-        (WebCore::TransformAnimationQt::TransformAnimationQt): transform bugs
-        (WebCore::OpacityAnimationQt::updateState): style change
-
 2010-02-02  Joel Stanley  <joel@jms.id.au>
 
         Reviewed by David Levin.

third_party/WebKit/WebKit/qt/Api/qgraphicswebview.cpp

@@ -27,7 +27,6 @@
 #include "qwebpage_p.h"
 #include "QWebPageClient.h"
 #include <FrameView.h>
-#include <QtCore/qmetaobject.h>
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qtimer.h>
 #include <QtGui/qapplication.h>
@@ -79,14 +78,13 @@ public:
         , page(0)
 #if USE(ACCELERATED_COMPOSITING)
         , rootGraphicsLayer(0)
-        , shouldSync(false)
+        , shouldSync(true)
 #endif
     {
 #if USE(ACCELERATED_COMPOSITING)
         // the overlay and stays alive for the lifetime of
         // this QGraphicsWebView as the scrollbars are needed when there's no compositing
         q->setFlag(QGraphicsItem::ItemUsesExtendedStyleOption);
-        syncMetaMethod = q->metaObject()->method(q->metaObject()->indexOfMethod("syncLayers()"));
 #endif
     }
 
@@ -133,9 +131,6 @@ public:
     // compositor telling us to do so. We'll get that call from ChromeClientQt
     bool shouldSync;
 
-    // we have to flush quite often, so we use a meta-method instead of QTimer::singleShot for putting the event in the queue
-    QMetaMethod syncMetaMethod;
-
     // we need to put the root graphics layer behind the overlay (which contains the scrollbar)
     enum { RootGraphicsLayerZValue, OverlayZValue };
 #endif
@@ -183,7 +178,7 @@ void QGraphicsWebViewPrivate::markForSync(bool scheduleSync)
 {
     shouldSync = true;
     if (scheduleSync)
-        syncMetaMethod.invoke(q, Qt::QueuedConnection);
+        QTimer::singleShot(0, q, SLOT(syncLayers()));
 }
 
 void QGraphicsWebViewPrivate::updateCompositingScrollPosition()
@@ -229,7 +224,6 @@ void QGraphicsWebViewPrivate::update(const QRect & dirtyRect)
 #if USE(ACCELERATED_COMPOSITING)
     if (overlay)
         overlay->update(QRectF(dirtyRect));
-    syncLayers();
 #endif
 }
 
@@ -448,6 +442,7 @@ void QGraphicsWebView::paint(QPainter* painter, const QStyleOptionGraphicsItem*
 {
 #if USE(ACCELERATED_COMPOSITING)
     page()->mainFrame()->render(painter, d->overlay ? QWebFrame::ContentsLayer : QWebFrame::AllLayers, option->exposedRect.toAlignedRect());
+    d->syncLayers();
 #else
     page()->mainFrame()->render(painter, QWebFrame::AllLayers, option->exposedRect.toRect());
 #endif

third_party/WebKit/WebKit/qt/ChangeLog

-2010-02-03  No'am Rosenthal  <noam.rosenthal@nokia.com>
+2010-02-03  Andras Becsi  <abecsi@webkit.org>
 
-        Reviewed by Laszlo Gombos.
+        Unreviewed build fix.
 
-        [Qt] Tuning and optimizations to GraphicsLayerQt. Mainly reduced usage
-        of QTimer::singleShot, and moved syncLayers() from paint() to update()
-        https://bugs.webkit.org/show_bug.cgi?id=34062
+        [Qt] Roll-out r54281 because it broke the build on the Qt Release bot.
 
         * Api/qgraphicswebview.cpp:
-        (QGraphicsWebViewPrivate::update): Moved the sync operation to update
-        (QGraphicsWebView::paint): Moved the sync operation to update
+        (QGraphicsWebViewPrivate::QGraphicsWebViewPrivate):
+        (QGraphicsWebViewPrivate::markForSync):
+        (QGraphicsWebViewPrivate::update):
+        (QGraphicsWebView::paint):
 
 2010-02-02  Kenneth Rohde Christiansen  <kenneth@webkit.org>