Title: [90644] trunk/Source/WebKit2
- Revision
- 90644
- Author
- [email protected]
- Date
- 2011-07-08 11:06:20 -0700 (Fri, 08 Jul 2011)
Log Message
[Qt][WK2] Get rid of the check for TILED_BACKING_STORE in Qt
https://bugs.webkit.org/show_bug.cgi?id=64175
Reviewed by Kenneth Rohde Christiansen.
Qt no longer supports building WebKit2 without TILED_BACKING_STORE.
* UIProcess/API/qt/qtouchwebpage.cpp:
(QTouchWebPagePrivate::onScaleChanged):
* UIProcess/qt/QtWebPageProxy.cpp:
(QtWebPageProxy::setResizesToContentsUsingLayoutSize):
* UIProcess/qt/TiledDrawingAreaProxyQt.cpp:
* UIProcess/qt/TiledDrawingAreaTileQt.cpp:
* WebProcess/WebPage/qt/TiledDrawingAreaQt.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (90643 => 90644)
--- trunk/Source/WebKit2/ChangeLog 2011-07-08 17:54:05 UTC (rev 90643)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-08 18:06:20 UTC (rev 90644)
@@ -1,5 +1,22 @@
2011-07-08 Benjamin Poulain <[email protected]>
+ [Qt][WK2] Get rid of the check for TILED_BACKING_STORE in Qt
+ https://bugs.webkit.org/show_bug.cgi?id=64175
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Qt no longer supports building WebKit2 without TILED_BACKING_STORE.
+
+ * UIProcess/API/qt/qtouchwebpage.cpp:
+ (QTouchWebPagePrivate::onScaleChanged):
+ * UIProcess/qt/QtWebPageProxy.cpp:
+ (QtWebPageProxy::setResizesToContentsUsingLayoutSize):
+ * UIProcess/qt/TiledDrawingAreaProxyQt.cpp:
+ * UIProcess/qt/TiledDrawingAreaTileQt.cpp:
+ * WebProcess/WebPage/qt/TiledDrawingAreaQt.cpp:
+
+2011-07-08 Benjamin Poulain <[email protected]>
+
[WK2] Do not forward touch events to the web process when it does not need them
https://bugs.webkit.org/show_bug.cgi?id=64164
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp (90643 => 90644)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp 2011-07-08 17:54:05 UTC (rev 90643)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp 2011-07-08 18:06:20 UTC (rev 90644)
@@ -179,10 +179,8 @@
void QTouchWebPagePrivate::onScaleChanged()
{
-#if ENABLE(TILED_BACKING_STORE)
if (!m_isChangingScale)
m_scaleCommitTimer.start(0.1, q);
-#endif
}
void QTouchWebPagePrivate::setPage(QTouchWebPageProxy* page)
Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp (90643 => 90644)
--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-08 17:54:05 UTC (rev 90643)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp 2011-07-08 18:06:20 UTC (rev 90644)
@@ -621,9 +621,7 @@
void QtWebPageProxy::setResizesToContentsUsingLayoutSize(const QSize& targetLayoutSize)
{
-#if ENABLE(TILED_BACKING_STORE)
m_webPageProxy->setResizesToContentsUsingLayoutSize(targetLayoutSize);
-#endif
}
void QtWebPageProxy::triggerAction(WebAction webAction, bool)
Modified: trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp (90643 => 90644)
--- trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp 2011-07-08 17:54:05 UTC (rev 90643)
+++ trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaProxyQt.cpp 2011-07-08 18:06:20 UTC (rev 90644)
@@ -26,8 +26,6 @@
#include "config.h"
#include "TiledDrawingAreaProxy.h"
-#if ENABLE(TILED_BACKING_STORE)
-
#include "ShareableBitmap.h"
#include "WKAPICast.h"
#include "WebPageProxy.h"
@@ -61,5 +59,3 @@
}
} // namespace WebKit
-
-#endif
Modified: trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp (90643 => 90644)
--- trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp 2011-07-08 17:54:05 UTC (rev 90643)
+++ trunk/Source/WebKit2/UIProcess/qt/TiledDrawingAreaTileQt.cpp 2011-07-08 18:06:20 UTC (rev 90644)
@@ -26,8 +26,6 @@
#include "config.h"
#include "TiledDrawingAreaTile.h"
-#if ENABLE(TILED_BACKING_STORE)
-
#include "GraphicsContext.h"
#include "ShareableBitmap.h"
#include "TiledDrawingAreaProxy.h"
@@ -165,4 +163,3 @@
}
}
-#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/TiledDrawingAreaQt.cpp (90643 => 90644)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/TiledDrawingAreaQt.cpp 2011-07-08 17:54:05 UTC (rev 90643)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/TiledDrawingAreaQt.cpp 2011-07-08 18:06:20 UTC (rev 90644)
@@ -26,8 +26,6 @@
#include "config.h"
#include "TiledDrawingArea.h"
-#if ENABLE(TILED_BACKING_STORE)
-
#include "ShareableBitmap.h"
#include "WebPage.h"
#include <WebCore/GraphicsContext.h>
@@ -52,5 +50,3 @@
}
} // namespace WebKit
-
-#endif // TILED_BACKING_STORE
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
