Changeset 95275 in webkit
- Timestamp:
- Sep 16, 2011 12:15:57 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r95274 r95275 1 2011-09-16 Leo Yang <leo.yang@torchmobile.com.cn> 2 3 [Qt] Crash when dragging google maps. 4 https://bugs.webkit.org/show_bug.cgi?id=68223 5 6 Test case to use an unready custom cursor. 7 8 Reviewed by Adam Barth. 9 10 * fast/css/crash-on-custom-cursor-when-loading-expected.txt: Added. 11 * fast/css/crash-on-custom-cursor-when-loading.html: Added. 12 1 13 2011-09-15 Keishi Hattori <keishi@webkit.org> 2 14 -
trunk/Source/WebCore/ChangeLog
r95271 r95275 1 2011-09-16 Leo Yang <leo.yang@torchmobile.com.cn> 2 3 [Qt] Crash when dragging google maps. 4 https://bugs.webkit.org/show_bug.cgi?id=68223 5 6 The custom image for a cursor might not be ready when WebKit trying 7 to use it to construct the cursor in Qt porting. This patch is using 8 arrow image to substitute the unready custom image. 9 10 Reviewed by Adam Barth. 11 12 Test: fast/css/crash-on-custom-cursor-when-loading.html 13 14 * platform/qt/CursorQt.cpp: 15 (WebCore::createCustomCursor): 16 (WebCore::Cursor::ensurePlatformCursor): 17 1 18 2011-09-15 Adam Barth <abarth@webkit.org> 2 19 -
trunk/Source/WebCore/platform/qt/CursorQt.cpp
r69110 r95275 76 76 static QCursor* createCustomCursor(Image* image, const IntPoint& hotSpot) 77 77 { 78 if (!image->nativeImageForCurrentFrame()) 79 return 0; 78 80 IntPoint effectiveHotSpot = determineHotSpot(image, hotSpot); 79 81 return new QCursor(*(image->nativeImageForCurrentFrame()), effectiveHotSpot.x(), effectiveHotSpot.y()); … … 198 200 case Custom: 199 201 m_platformCursor = createCustomCursor(m_image.get(), m_hotSpot); 202 if (!m_platformCursor) 203 m_platformCursor = new QCursor(Qt::ArrowCursor); 200 204 break; 201 205 default:
Note: See TracChangeset
for help on using the changeset viewer.