Title: [91990] trunk/Source/WebKit2
- Revision
- 91990
- Author
- [email protected]
- Date
- 2011-07-29 06:36:36 -0700 (Fri, 29 Jul 2011)
Log Message
Fix the QTouchWebView in debug broke in 91979.
https://bugs.webkit.org/show_bug.cgi?id=64728
Reviewed by Benjamin Poulain.
registerTile is called in the Tile's constructor, before adoptRef.
Change the pointer parameter to use the raw type instead.
* UIProcess/TiledDrawingAreaProxy.cpp:
(WebKit::TiledDrawingAreaProxy::registerTile):
* UIProcess/TiledDrawingAreaProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (91989 => 91990)
--- trunk/Source/WebKit2/ChangeLog 2011-07-29 12:49:28 UTC (rev 91989)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-29 13:36:36 UTC (rev 91990)
@@ -1,3 +1,17 @@
+2011-07-29 Jocelyn Turcotte <[email protected]>
+
+ Fix the QTouchWebView in debug broke in 91979.
+ https://bugs.webkit.org/show_bug.cgi?id=64728
+
+ Reviewed by Benjamin Poulain.
+
+ registerTile is called in the Tile's constructor, before adoptRef.
+ Change the pointer parameter to use the raw type instead.
+
+ * UIProcess/TiledDrawingAreaProxy.cpp:
+ (WebKit::TiledDrawingAreaProxy::registerTile):
+ * UIProcess/TiledDrawingAreaProxy.h:
+
2011-07-29 Alexis Menard <[email protected]>
[Qt] Make QDesktopWebView/QTouchWebView loadProgress property more usable in QML.
Modified: trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp (91989 => 91990)
--- trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp 2011-07-29 12:49:28 UTC (rev 91989)
+++ trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.cpp 2011-07-29 13:36:36 UTC (rev 91990)
@@ -182,9 +182,9 @@
tileBufferUpdateComplete();
}
-void TiledDrawingAreaProxy::registerTile(int tileID, PassRefPtr<TiledDrawingAreaTile> tile)
+void TiledDrawingAreaProxy::registerTile(int tileID, TiledDrawingAreaTile* tile)
{
- m_tilesByID.set(tileID, tile.get());
+ m_tilesByID.set(tileID, tile);
}
void TiledDrawingAreaProxy::unregisterTile(int tileID)
Modified: trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h (91989 => 91990)
--- trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h 2011-07-29 12:49:28 UTC (rev 91989)
+++ trunk/Source/WebKit2/UIProcess/TiledDrawingAreaProxy.h 2011-07-29 13:36:36 UTC (rev 91990)
@@ -112,7 +112,7 @@
virtual void tileUpdated(int tileID, const UpdateInfo& updateInfo, float scale, unsigned pendingUpdateCount);
virtual void allTileUpdatesProcessed();
- void registerTile(int tileID, PassRefPtr<TiledDrawingAreaTile>);
+ void registerTile(int tileID, TiledDrawingAreaTile*);
void unregisterTile(int tileID);
void requestTileUpdate(int tileID, const WebCore::IntRect& dirtyRect);
void cancelTileUpdate(int tileID);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
