[webkit-changes] [92052] trunk/Source/WebKit2

[kbalazs]

Title: [92052] trunk/Source/WebKit2

Revision

92052

Author

kbal...@webkit.org

Date

2011-07-30 10:39:44 -0700 (Sat, 30 Jul 2011)

Log Message

[Qt][WK2] Fix the build afer r92014
https://bugs.webkit.org/show_bug.cgi?id=65410

Reviewed by Noam Rosenthal.

* Shared/ShareableBitmap.h:
* UIProcess/qt/qdesktopwebpageproxy.cpp:
(QDesktopWebPageProxy::paintContent):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/Shared/ShareableBitmap.h
• trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (92051 => 92052)

--- trunk/Source/WebKit2/ChangeLog	2011-07-30 12:42:56 UTC (rev 92051)
+++ trunk/Source/WebKit2/ChangeLog	2011-07-30 17:39:44 UTC (rev 92052)
@@ -1,3 +1,14 @@
+2011-07-30  Balazs Kelemen  <kbal...@webkit.org>
+
+        [Qt][WK2] Fix the build afer r92014
+        https://bugs.webkit.org/show_bug.cgi?id=65410
+
+        Reviewed by Noam Rosenthal.
+
+        * Shared/ShareableBitmap.h:
+        * UIProcess/qt/qdesktopwebpageproxy.cpp:
+        (QDesktopWebPageProxy::paintContent):
+
 2011-07-29  Sam Weinig  <s...@webkit.org>
 
         Move Region code from WebKit2 to WebCore

Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.h (92051 => 92052)

--- trunk/Source/WebKit2/Shared/ShareableBitmap.h	2011-07-30 12:42:56 UTC (rev 92051)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.h	2011-07-30 17:39:44 UTC (rev 92052)
@@ -43,7 +43,12 @@
 
 #if PLATFORM(QT)
 #include <QImage>
+#ifdef Q_WS_X11
+// Avoid ambiguity caused by the Region typedef from qwindowdefs.h.
+namespace WebCore { class Region; }
+namespace WebKit { using WebCore::Region; }
 #endif
+#endif
 
 namespace WebCore {
     class Image;

Modified: trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp (92051 => 92052)

--- trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp	2011-07-30 12:42:56 UTC (rev 92051)
+++ trunk/Source/WebKit2/UIProcess/qt/qdesktopwebpageproxy.cpp	2011-07-30 17:39:44 UTC (rev 92052)
@@ -61,7 +61,7 @@
 void QDesktopWebPageProxy::paintContent(QPainter* painter, const QRect& area)
 {
     // FIXME: Do something with the unpainted region?
-    WebKit::Region unpaintedRegion;
+    WebCore::Region unpaintedRegion;
     static_cast<DrawingAreaProxyImpl*>(m_webPageProxy->drawingArea())->paint(painter, area, unpaintedRegion);
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes