Changeset 57734 in webkit

Timestamp:

Apr 16, 2010 12:58:02 PM (14 years ago)

Author:

andersca@apple.com

Message:

2010-04-16 Anders Carlsson <​andersca@apple.com>

Reviewed by David Hyatt.

Always pass a view to the AppKit drawing functions.
​https://bugs.webkit.org/show_bug.cgi?id=37724

• platform/mac/ThemeMac.mm: (WebCore::paintCheckbox): (WebCore::paintRadio):
• rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::paintMenuList): (WebCore::RenderThemeMac::paintSliderThumb): (WebCore::RenderThemeMac::paintSearchField): (WebCore::RenderThemeMac::paintSearchFieldCancelButton): (WebCore::RenderThemeMac::paintSearchFieldResultsDecoration): (WebCore::RenderThemeMac::paintSearchFieldResultsButton):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/ThemeMac.mm (modified) (2 diffs)
• rendering/RenderThemeMac.mm (modified) (7 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-16  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by David Hyatt.
+
+        Always pass a view to the AppKit drawing functions.
+        https://bugs.webkit.org/show_bug.cgi?id=37724
+
+        * platform/mac/ThemeMac.mm:
+        (WebCore::paintCheckbox):
+        (WebCore::paintRadio):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintMenuList):
+        (WebCore::RenderThemeMac::paintSliderThumb):
+        (WebCore::RenderThemeMac::paintSearchField):
+        (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+        (WebCore::RenderThemeMac::paintSearchFieldResultsDecoration):
+        (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+
 2010-04-16  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebCore/platform/mac/ThemeMac.mm

@@ -231 +231 @@
     }
     
-    [checkboxCell drawWithFrame:NSRect(inflatedRect) inView:scrollView->documentView()];
+    [checkboxCell drawWithFrame:NSRect(inflatedRect) inView:ThemeMac::ensuredView(scrollView)];
     [checkboxCell setControlView:nil];
 
@@ -309 +309 @@
     
     BEGIN_BLOCK_OBJC_EXCEPTIONS
-    [radioCell drawWithFrame:NSRect(inflatedRect) inView:scrollView->documentView()];
+    [radioCell drawWithFrame:NSRect(inflatedRect) inView:ThemeMac::ensuredView(scrollView)];
     [radioCell setControlView:nil];
     END_BLOCK_OBJC_EXCEPTIONS

trunk/WebCore/rendering/RenderThemeMac.mm

@@ -41 +41 @@
 #import "SharedBuffer.h"
 #import "TimeRanges.h"
+#import "ThemeMac.h"
 #import "WebCoreSystemInterface.h"
 #import "UserAgentStyleSheets.h"
@@ -775 +776 @@
     }
 
-    [popupButton drawWithFrame:inflatedRect inView:o->view()->frameView()->documentView()];
+    [popupButton drawWithFrame:inflatedRect inView:ThemeMac::ensuredView(o->view()->frameView())];
     [popupButton setControlView:nil];
 
@@ -1233 +1234 @@
     }
 
-    [sliderThumbCell drawWithFrame:unzoomedRect inView:o->view()->frameView()->documentView()];
+    [sliderThumbCell drawWithFrame:unzoomedRect inView:ThemeMac::ensuredView(o->view()->frameView())];
     [sliderThumbCell setControlView:nil];
 
@@ -1265 +1266 @@
     [search setSearchButtonCell:nil];
 
-    [search drawWithFrame:NSRect(unzoomedRect) inView:o->view()->frameView()->documentView()];
+    [search drawWithFrame:NSRect(unzoomedRect) inView:ThemeMac::ensuredView(o->view()->frameView())];
 #ifdef BUILDING_ON_TIGER
     if ([search showsFirstResponder])
@@ -1365 +1366 @@
     }
 
-    [[search cancelButtonCell] drawWithFrame:unzoomedRect inView:o->view()->frameView()->documentView()];
+    [[search cancelButtonCell] drawWithFrame:unzoomedRect inView:ThemeMac::ensuredView(o->view()->frameView())];
     [[search cancelButtonCell] setControlView:nil];
 
@@ -1430 +1431 @@
     localBounds = convertToPaintingRect(input->renderer(), o, localBounds, r);
 
-    [[search searchButtonCell] drawWithFrame:localBounds inView:o->view()->frameView()->documentView()];
+    [[search searchButtonCell] drawWithFrame:localBounds inView:ThemeMac::ensuredView(o->view()->frameView())];
     [[search searchButtonCell] setControlView:nil];
     return false;
@@ -1473 +1474 @@
     }
 
-    [[search searchButtonCell] drawWithFrame:unzoomedRect inView:o->view()->frameView()->documentView()];
+    [[search searchButtonCell] drawWithFrame:unzoomedRect inView:ThemeMac::ensuredView(o->view()->frameView())];
     [[search searchButtonCell] setControlView:nil];