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

[commit-queue]

Title: [86719] trunk/Source/WebKit2

Revision

86719

Author

commit-qu...@webkit.org

Date

2011-05-17 16:39:57 -0700 (Tue, 17 May 2011)

Log Message

2011-05-17  Sheriff Bot  <webkit.review....@gmail.com>

        Unreviewed, rolling out r86668.
        http://trac.webkit.org/changeset/86668
        https://bugs.webkit.org/show_bug.cgi?id=61001

        It made 52 tests crash on Qt WK2 bot (Requested by Ossy on
        #webkit).

        * UIProcess/API/qt/qgraphicswkview.cpp:
        * UIProcess/API/qt/qgraphicswkview.h:
        * UIProcess/API/qt/qwkpage.cpp:
        (QWKPagePrivate::createDrawingAreaProxy):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
• trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h
• trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (86718 => 86719)

--- trunk/Source/WebKit2/ChangeLog	2011-05-17 23:21:39 UTC (rev 86718)
+++ trunk/Source/WebKit2/ChangeLog	2011-05-17 23:39:57 UTC (rev 86719)
@@ -1,3 +1,17 @@
+2011-05-17  Sheriff Bot  <webkit.review....@gmail.com>
+
+        Unreviewed, rolling out r86668.
+        http://trac.webkit.org/changeset/86668
+        https://bugs.webkit.org/show_bug.cgi?id=61001
+
+        It made 52 tests crash on Qt WK2 bot (Requested by Ossy on
+        #webkit).
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        * UIProcess/API/qt/qgraphicswkview.h:
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::createDrawingAreaProxy):
+
 2011-05-17  Brian Weinstein  <bweinst...@apple.com>
 
         Build fix after r86717.

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp (86718 => 86719)

--- trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp	2011-05-17 23:21:39 UTC (rev 86718)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp	2011-05-17 23:39:57 UTC (rev 86719)
@@ -21,9 +21,11 @@
 #include "config.h"
 #include "qgraphicswkview.h"
 
+#include "ChunkedUpdateDrawingAreaProxy.h"
 #include "IntSize.h"
 #include "RunLoop.h"
 #include "TiledDrawingAreaProxy.h"
+#include "UpdateChunk.h"
 #include "WKAPICast.h"
 #include "qwkpage.h"
 #include "qwkpage_p.h"

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h (86718 => 86719)

--- trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h	2011-05-17 23:21:39 UTC (rev 86718)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qgraphicswkview.h	2011-05-17 23:39:57 UTC (rev 86719)
@@ -26,7 +26,7 @@
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
 
 public:
-    enum BackingStoreType { Simple, Tiled };
+    enum BackingStoreType { Simple, Tiled, Impl };
     QGraphicsWKView(QWKContext* context, BackingStoreType backingStoreType = Simple, QGraphicsItem* parent = 0);
 
     virtual ~QGraphicsWKView();

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp (86718 => 86719)

--- trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp	2011-05-17 23:21:39 UTC (rev 86718)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp	2011-05-17 23:39:57 UTC (rev 86719)
@@ -24,6 +24,7 @@
 
 #include "qwkpreferences_p.h"
 
+#include "ChunkedUpdateDrawingAreaProxy.h"
 #include "ClientImpl.h"
 #include "DrawingAreaProxyImpl.h"
 #include "qgraphicswkview.h"
@@ -137,7 +138,9 @@
     if (backingStoreType == QGraphicsWKView::Tiled)
         return TiledDrawingAreaProxy::create(wkView, page.get());
 #endif
-    return DrawingAreaProxyImpl::create(page.get());
+    if (backingStoreType == QGraphicsWKView::Impl)
+        return DrawingAreaProxyImpl::create(page.get());
+    return ChunkedUpdateDrawingAreaProxy::create(wkView, page.get());
 }
 
 void QWKPagePrivate::setViewNeedsDisplay(const WebCore::IntRect& rect)

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