<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[187961] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187961">187961</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 09:03:06 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkboxes and radio buttons should scale when zooming or pinching to zoom
https://bugs.webkit.org/show_bug.cgi?id=147405
Reviewed by Dean Jackson.
Refactors paintButton and paintToggleButton to use a temporary buffer when rendering
if the controls are zoomed. This affects checkboxes, radio buttons, and normal (push)
buttons.
* platform/mac/ThemeMac.h:
* platform/mac/ThemeMac.mm:
(WebCore::paintToggleButton): Refactored to use drawCellOrFocusRingWithViewIntoContext.
(WebCore::paintButton): Refactored to use drawCellOrFocusRingWithViewIntoContext.
(WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext): Draws a given button cell
and/or its focus ring into the given context, optionally using an offscreen buffer.
This is a static function in ThemeMac so it can be accessed later on by
RenderThemeMac when painting search fields that scale with zoom.
(WebCore::ThemeMac::paint):
(WebCore::buttonFocusRectOutlineWidth): Deleted. Made this value into a const float.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMach">trunk/Source/WebCore/platform/mac/ThemeMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMacmm">trunk/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187960 => 187961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-05 14:07:51 UTC (rev 187960)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 16:03:06 UTC (rev 187961)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-08-04 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Checkboxes and radio buttons should scale when zooming or pinching to zoom
+ https://bugs.webkit.org/show_bug.cgi?id=147405
+
+ Reviewed by Dean Jackson.
+
+ Refactors paintButton and paintToggleButton to use a temporary buffer when rendering
+ if the controls are zoomed. This affects checkboxes, radio buttons, and normal (push)
+ buttons.
+
+ * platform/mac/ThemeMac.h:
+ * platform/mac/ThemeMac.mm:
+ (WebCore::paintToggleButton): Refactored to use drawCellOrFocusRingWithViewIntoContext.
+ (WebCore::paintButton): Refactored to use drawCellOrFocusRingWithViewIntoContext.
+ (WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext): Draws a given button cell
+ and/or its focus ring into the given context, optionally using an offscreen buffer.
+ This is a static function in ThemeMac so it can be accessed later on by
+ RenderThemeMac when painting search fields that scale with zoom.
+ (WebCore::ThemeMac::paint):
+ (WebCore::buttonFocusRectOutlineWidth): Deleted. Made this value into a const float.
+
</ins><span class="cx"> 2015-08-04 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: tree item children returned from ranged getter are different from full array of children
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.h (187960 => 187961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.h 2015-08-05 14:07:51 UTC (rev 187960)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.h 2015-08-05 16:03:06 UTC (rev 187961)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> // FIXME: Once RenderThemeMac is converted over to use Theme then this can be internal to ThemeMac.
</span><span class="cx"> static NSView* ensuredView(ScrollView*, const ControlStates&, bool useUnparentedView = false);
</span><span class="cx"> static void setFocusRingClipRect(const FloatRect&);
</span><ins>+ static bool drawCellOrFocusRingWithViewIntoContext(RetainPtr<NSCell>, GraphicsContext*, const FloatRect&, NSView*, bool /* drawButtonCell */, bool /* drawFocusRing */, bool /* useImageBuffer */, float /* deviceScaleFactor */);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (187960 => 187961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-08-05 14:07:51 UTC (rev 187960)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-08-05 16:03:06 UTC (rev 187961)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void paintToggleButton(ControlPart buttonType, ControlStates& controlStates, GraphicsContext* context, const FloatRect& zoomedRect, float zoomFactor, ScrollView* scrollView)
</del><ins>+static void paintToggleButton(ControlPart buttonType, ControlStates& controlStates, GraphicsContext* context, const FloatRect& zoomedRect, float zoomFactor, ScrollView* scrollView, float deviceScaleFactor, float pageScaleFactor)
</ins><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx">
</span><span class="lines">@@ -425,8 +425,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> NSView *view = ThemeMac::ensuredView(scrollView, controlStates, useUnparentedView);
</span><span class="cx">
</span><del>- bool isAnimating = false;
</del><span class="cx"> bool needsRepaint = false;
</span><ins>+ bool useImageBuffer = pageScaleFactor != 1.0f || zoomFactor != 1.0f;
+ bool isCellFocused = controlStates.states() & ControlStates::FocusState;
</ins><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> if ([toggleButtonCell _stateAnimationRunning]) {
</span><span class="lines">@@ -435,15 +436,14 @@
</span><span class="cx"> context->translate(0, -inflatedRect.height());
</span><span class="cx">
</span><span class="cx"> [toggleButtonCell _renderCurrentAnimationFrameInContext:context->platformContext() atLocation:NSMakePoint(0, 0)];
</span><del>- isAnimating = [toggleButtonCell _stateAnimationRunning];
</del><ins>+ if (![toggleButtonCell _stateAnimationRunning] && isCellFocused)
+ needsRepaint = ThemeMac::drawCellOrFocusRingWithViewIntoContext(toggleButtonCell, context, inflatedRect, view, false, true, useImageBuffer, deviceScaleFactor);
</ins><span class="cx"> } else
</span><del>- [toggleButtonCell drawWithFrame:NSRect(inflatedRect) inView:view];
</del><ins>+ needsRepaint = ThemeMac::drawCellOrFocusRingWithViewIntoContext(toggleButtonCell, context, inflatedRect, view, true, isCellFocused, useImageBuffer, deviceScaleFactor);
</ins><span class="cx"> #else
</span><del>- [toggleButtonCell drawWithFrame:NSRect(inflatedRect) inView:view];
</del><ins>+ needsRepaint = ThemeMac::drawCellOrFocusRingWithViewIntoContext(toggleButtonCell, context, inflatedRect, view, true, isCellFocused, useImageBuffer, deviceScaleFactor);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (!isAnimating && (controlStates.states() & ControlStates::FocusState))
- needsRepaint = drawCellFocusRing(toggleButtonCell.get(), inflatedRect, view);
</del><span class="cx"> [toggleButtonCell setControlView:nil];
</span><span class="cx">
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="lines">@@ -519,11 +519,6 @@
</span><span class="cx"> setUpButtonCell(cell, part, controlStates, zoomedSize, zoomFactor);
</span><span class="cx"> return cell;
</span><span class="cx"> }
</span><del>-
-static float buttonFocusRectOutlineWidth()
-{
- return 3.0f;
-}
</del><span class="cx">
</span><span class="cx"> static void paintButton(ControlPart part, ControlStates& controlStates, GraphicsContext* context, const FloatRect& zoomedRect, float zoomFactor, ScrollView* scrollView, float deviceScaleFactor, float pageScaleFactor)
</span><span class="cx"> {
</span><span class="lines">@@ -558,21 +553,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool shouldUseImageBuffer = pageScaleFactor != 1.0f || zoomFactor != 1.0f;
- float focusThickness = buttonFocusRectOutlineWidth();
</del><ins>+ LocalCurrentGraphicsContext localContext(context);
</ins><span class="cx">
</span><del>- std::unique_ptr<ImageBuffer> imageBuffer;
- GraphicsContext* drawButtonContext = context;
- if (shouldUseImageBuffer) {
- imageBuffer = ImageBuffer::createCompatibleBuffer(inflatedRect.size() + 2 * FloatSize(focusThickness, focusThickness), deviceScaleFactor, ColorSpaceDeviceRGB, context, false);
- drawButtonContext = imageBuffer->context();
- }
- LocalCurrentGraphicsContext localContext(drawButtonContext);
-
</del><span class="cx"> NSView *view = ThemeMac::ensuredView(scrollView, controlStates);
</span><span class="cx"> NSWindow *window = [view window];
</span><span class="cx"> NSButtonCell *previousDefaultButtonCell = [window defaultButtonCell];
</span><span class="cx">
</span><ins>+ bool useImageBuffer = pageScaleFactor != 1.0f || zoomFactor != 1.0f;
+ bool needsRepaint = ThemeMac::drawCellOrFocusRingWithViewIntoContext(buttonCell, context, inflatedRect, view, true, states & ControlStates::FocusState, useImageBuffer, deviceScaleFactor);
</ins><span class="cx"> if (states & ControlStates::DefaultState) {
</span><span class="cx"> [window setDefaultButtonCell:buttonCell];
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</span><span class="lines">@@ -580,24 +568,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> } else if ([previousDefaultButtonCell isEqual:buttonCell])
</span><span class="cx"> [window setDefaultButtonCell:nil];
</span><del>-
- FloatRect drawFromImageBufferRect(focusThickness, focusThickness, inflatedRect.width(), inflatedRect.height());
- if (shouldUseImageBuffer) {
- [buttonCell drawWithFrame:NSRect(drawFromImageBufferRect) inView:view];
- if (!(states & ControlStates::FocusState))
- context->drawImageBuffer(imageBuffer.get(), ColorSpaceDeviceRGB, inflatedRect.location() - FloatSize(focusThickness, focusThickness));
- } else
- [buttonCell drawWithFrame:NSRect(inflatedRect) inView:view];
</del><span class="cx">
</span><del>- if (states & ControlStates::FocusState) {
- if (shouldUseImageBuffer) {
- drawCellFocusRing(buttonCell, NSRect(drawFromImageBufferRect), view);
- context->drawImageBuffer(imageBuffer.get(), ColorSpaceDeviceRGB, inflatedRect.location() - FloatSize(focusThickness, focusThickness));
- } else
- drawCellFocusRing(buttonCell, NSRect(inflatedRect), view);
- }
-
- controlStates.setNeedsRepaint(false);
</del><ins>+ controlStates.setNeedsRepaint(needsRepaint);
</ins><span class="cx">
</span><span class="cx"> [buttonCell setControlView:nil];
</span><span class="cx">
</span><span class="lines">@@ -690,6 +662,35 @@
</span><span class="cx"> focusRingClipRect = rect;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const float buttonFocusRectOutlineWidth = 3.0f;
+
+bool ThemeMac::drawCellOrFocusRingWithViewIntoContext(RetainPtr<NSCell> cell, GraphicsContext* context, const FloatRect& inflatedRect, NSView* view, bool drawButtonCell, bool drawFocusRing, bool useImageBuffer, float deviceScaleFactor)
+{
+ ASSERT(drawButtonCell || drawFocusRing);
+ bool needsRepaint = false;
+ if (useImageBuffer) {
+ NSRect imageBufferDrawRect = CGRectMake(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth, inflatedRect.width(), inflatedRect.height());
+ std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::createCompatibleBuffer(inflatedRect.size() + 2 * FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth), deviceScaleFactor, ColorSpaceSRGB, context, false);
+ {
+ LocalCurrentGraphicsContext localContext(imageBuffer->context());
+ if (drawButtonCell)
+ [cell drawWithFrame:imageBufferDrawRect inView:view];
+
+ if (drawFocusRing)
+ needsRepaint = drawCellFocusRing(cell.get(), imageBufferDrawRect, view);
+ }
+ context->drawImageBuffer(imageBuffer.get(), ColorSpaceSRGB, inflatedRect.location() - FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth));
+ return needsRepaint;
+ }
+ if (drawButtonCell)
+ [cell drawWithFrame:NSRect(inflatedRect) inView:view];
+
+ if (drawFocusRing)
+ needsRepaint = drawCellFocusRing(cell.get(), NSRect(inflatedRect), view);
+
+ return needsRepaint;
+}
+
</ins><span class="cx"> // Theme overrides
</span><span class="cx">
</span><span class="cx"> int ThemeMac::baselinePositionAdjustment(ControlPart part) const
</span><span class="lines">@@ -843,10 +844,10 @@
</span><span class="cx"> {
</span><span class="cx"> switch (part) {
</span><span class="cx"> case CheckboxPart:
</span><del>- paintToggleButton(part, states, context, zoomedRect, zoomFactor, scrollView);
</del><ins>+ paintToggleButton(part, states, context, zoomedRect, zoomFactor, scrollView, deviceScaleFactor, pageScaleFactor);
</ins><span class="cx"> break;
</span><span class="cx"> case RadioPart:
</span><del>- paintToggleButton(part, states, context, zoomedRect, zoomFactor, scrollView);
</del><ins>+ paintToggleButton(part, states, context, zoomedRect, zoomFactor, scrollView, deviceScaleFactor, pageScaleFactor);
</ins><span class="cx"> break;
</span><span class="cx"> case PushButtonPart:
</span><span class="cx"> case DefaultButtonPart:
</span></span></pre>
</div>
</div>
</body>
</html>