Changeset 57734 in webkit
- Timestamp:
- Apr 16, 2010 12:58:02 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r57733 r57734 1 2010-04-16 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by David Hyatt. 4 5 Always pass a view to the AppKit drawing functions. 6 https://bugs.webkit.org/show_bug.cgi?id=37724 7 8 * platform/mac/ThemeMac.mm: 9 (WebCore::paintCheckbox): 10 (WebCore::paintRadio): 11 * rendering/RenderThemeMac.mm: 12 (WebCore::RenderThemeMac::paintMenuList): 13 (WebCore::RenderThemeMac::paintSliderThumb): 14 (WebCore::RenderThemeMac::paintSearchField): 15 (WebCore::RenderThemeMac::paintSearchFieldCancelButton): 16 (WebCore::RenderThemeMac::paintSearchFieldResultsDecoration): 17 (WebCore::RenderThemeMac::paintSearchFieldResultsButton): 18 1 19 2010-04-16 Alexey Proskuryakov <ap@apple.com> 2 20 -
trunk/WebCore/platform/mac/ThemeMac.mm
r57603 r57734 231 231 } 232 232 233 [checkboxCell drawWithFrame:NSRect(inflatedRect) inView: scrollView->documentView()];233 [checkboxCell drawWithFrame:NSRect(inflatedRect) inView:ThemeMac::ensuredView(scrollView)]; 234 234 [checkboxCell setControlView:nil]; 235 235 … … 309 309 310 310 BEGIN_BLOCK_OBJC_EXCEPTIONS 311 [radioCell drawWithFrame:NSRect(inflatedRect) inView: scrollView->documentView()];311 [radioCell drawWithFrame:NSRect(inflatedRect) inView:ThemeMac::ensuredView(scrollView)]; 312 312 [radioCell setControlView:nil]; 313 313 END_BLOCK_OBJC_EXCEPTIONS -
trunk/WebCore/rendering/RenderThemeMac.mm
r57051 r57734 41 41 #import "SharedBuffer.h" 42 42 #import "TimeRanges.h" 43 #import "ThemeMac.h" 43 44 #import "WebCoreSystemInterface.h" 44 45 #import "UserAgentStyleSheets.h" … … 775 776 } 776 777 777 [popupButton drawWithFrame:inflatedRect inView: o->view()->frameView()->documentView()];778 [popupButton drawWithFrame:inflatedRect inView:ThemeMac::ensuredView(o->view()->frameView())]; 778 779 [popupButton setControlView:nil]; 779 780 … … 1233 1234 } 1234 1235 1235 [sliderThumbCell drawWithFrame:unzoomedRect inView: o->view()->frameView()->documentView()];1236 [sliderThumbCell drawWithFrame:unzoomedRect inView:ThemeMac::ensuredView(o->view()->frameView())]; 1236 1237 [sliderThumbCell setControlView:nil]; 1237 1238 … … 1265 1266 [search setSearchButtonCell:nil]; 1266 1267 1267 [search drawWithFrame:NSRect(unzoomedRect) inView: o->view()->frameView()->documentView()];1268 [search drawWithFrame:NSRect(unzoomedRect) inView:ThemeMac::ensuredView(o->view()->frameView())]; 1268 1269 #ifdef BUILDING_ON_TIGER 1269 1270 if ([search showsFirstResponder]) … … 1365 1366 } 1366 1367 1367 [[search cancelButtonCell] drawWithFrame:unzoomedRect inView: o->view()->frameView()->documentView()];1368 [[search cancelButtonCell] drawWithFrame:unzoomedRect inView:ThemeMac::ensuredView(o->view()->frameView())]; 1368 1369 [[search cancelButtonCell] setControlView:nil]; 1369 1370 … … 1430 1431 localBounds = convertToPaintingRect(input->renderer(), o, localBounds, r); 1431 1432 1432 [[search searchButtonCell] drawWithFrame:localBounds inView: o->view()->frameView()->documentView()];1433 [[search searchButtonCell] drawWithFrame:localBounds inView:ThemeMac::ensuredView(o->view()->frameView())]; 1433 1434 [[search searchButtonCell] setControlView:nil]; 1434 1435 return false; … … 1473 1474 } 1474 1475 1475 [[search searchButtonCell] drawWithFrame:unzoomedRect inView: o->view()->frameView()->documentView()];1476 [[search searchButtonCell] drawWithFrame:unzoomedRect inView:ThemeMac::ensuredView(o->view()->frameView())]; 1476 1477 [[search searchButtonCell] setControlView:nil]; 1477 1478
Note: See TracChangeset
for help on using the changeset viewer.