Title: [123796] trunk/Source
- Revision
- 123796
- Author
- zeno.albis...@nokia.com
- Date
- 2012-07-26 14:46:16 -0700 (Thu, 26 Jul 2012)
Log Message
Unreviewed Qt buildfix after r123786.
Qt-minimal builds with ENABLE_REQUEST_ANIMATION_FRAME=0.
Therefore adding #ifdefs to allow for that configuration.
Source/WebKit/qt:
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore):
* WebCoreSupport/ChromeClientQt.h:
(ChromeClientQt):
Source/WebKit2:
* WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:
(WebKit):
* WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h:
(LayerTreeCoordinator):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (123795 => 123796)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-26 21:37:16 UTC (rev 123795)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-26 21:46:16 UTC (rev 123796)
@@ -1,5 +1,17 @@
2012-07-26 Zeno Albisser <z...@webkit.org>
+ Unreviewed Qt buildfix after r123786.
+
+ Qt-minimal builds with ENABLE_REQUEST_ANIMATION_FRAME=0.
+ Therefore adding #ifdefs to allow for that configuration.
+
+ * WebCoreSupport/ChromeClientQt.cpp:
+ (WebCore):
+ * WebCoreSupport/ChromeClientQt.h:
+ (ChromeClientQt):
+
+2012-07-26 Zeno Albisser <z...@webkit.org>
+
[Qt] requestAnimationFrame should only trigger when a new frame can be displayed.
https://bugs.webkit.org/show_bug.cgi?id=88638
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (123795 => 123796)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2012-07-26 21:37:16 UTC (rev 123795)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2012-07-26 21:46:16 UTC (rev 123796)
@@ -89,6 +89,7 @@
namespace WebCore {
+#if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER)
class RefreshAnimation : public QAbstractAnimation {
public:
RefreshAnimation(ChromeClientQt* chromeClient)
@@ -120,6 +121,7 @@
ChromeClientQt* m_chromeClient;
bool m_animationScheduled;
};
+#endif
bool ChromeClientQt::dumpVisitedLinksCallbacks = false;
@@ -651,6 +653,7 @@
#endif
}
+#if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER)
void ChromeClientQt::scheduleAnimation()
{
if (!m_refreshAnimation)
@@ -662,6 +665,7 @@
{
m_webPage->mainFrame()->d->frame->view()->serviceScriptedAnimations(convertSecondsToDOMTimeStamp(currentTime()));
}
+#endif
#if USE(ACCELERATED_COMPOSITING)
void ChromeClientQt::attachRootGraphicsLayer(Frame* frame, GraphicsLayer* graphicsLayer)
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h (123795 => 123796)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2012-07-26 21:37:16 UTC (rev 123795)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h 2012-07-26 21:46:16 UTC (rev 123796)
@@ -177,8 +177,10 @@
virtual void setCursor(const Cursor&);
virtual void setCursorHiddenUntilMouseMoves(bool) { }
+#if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER)
virtual void scheduleAnimation();
virtual void serviceScriptedAnimations();
+#endif
virtual void scrollRectIntoView(const LayoutRect) const { }
@@ -205,7 +207,9 @@
bool statusBarVisible;
bool menuBarVisible;
QEventLoop* m_eventLoop;
+#if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER)
OwnPtr<RefreshAnimation> m_refreshAnimation;
+#endif
#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
FullScreenVideoQt* m_fullScreenVideo;
Modified: trunk/Source/WebKit2/ChangeLog (123795 => 123796)
--- trunk/Source/WebKit2/ChangeLog 2012-07-26 21:37:16 UTC (rev 123795)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-26 21:46:16 UTC (rev 123796)
@@ -1,5 +1,17 @@
2012-07-26 Zeno Albisser <z...@webkit.org>
+ Unreviewed Qt buildfix after r123786.
+
+ Qt-minimal builds with ENABLE_REQUEST_ANIMATION_FRAME=0.
+ Therefore adding #ifdefs to allow for that configuration.
+
+ * WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp:
+ (WebKit):
+ * WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h:
+ (LayerTreeCoordinator):
+
+2012-07-26 Zeno Albisser <z...@webkit.org>
+
[Qt] requestAnimationFrame should only trigger when a new frame can be displayed.
https://bugs.webkit.org/show_bug.cgi?id=88638
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp (123795 => 123796)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp 2012-07-26 21:37:16 UTC (rev 123795)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.cpp 2012-07-26 21:46:16 UTC (rev 123796)
@@ -548,10 +548,12 @@
m_shouldSendScrollPositionUpdate = true;
}
+#if USE(UI_SIDE_COMPOSITING)
void LayerTreeCoordinator::scheduleAnimation()
{
scheduleLayerFlush();
}
+#endif
void LayerTreeCoordinator::renderNextFrame()
{
Modified: trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h (123795 => 123796)
--- trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h 2012-07-26 21:37:16 UTC (rev 123795)
+++ trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeCoordinator/LayerTreeCoordinator.h 2012-07-26 21:46:16 UTC (rev 123796)
@@ -86,7 +86,9 @@
virtual void syncFixedLayers();
virtual PassOwnPtr<WebCore::GraphicsContext> beginContentUpdate(const WebCore::IntSize&, ShareableBitmap::Flags, ShareableSurface::Handle&, WebCore::IntPoint&);
+#if USE(UI_SIDE_COMPOSITING)
virtual void scheduleAnimation() OVERRIDE;
+#endif
protected:
explicit LayerTreeCoordinator(WebPage*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
