Changeset 235435 in webkit
- Timestamp:
- Aug 28, 2018 11:56:37 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r235429 r235435 1 2018-08-28 Aditya Keerthi <akeerthi@apple.com> 2 3 [macOS] Color wells should appear rounded and textured 4 https://bugs.webkit.org/show_bug.cgi?id=189039 5 6 Reviewed by Tim Horton. 7 8 Rebaseline tests to match new color-well appearance. 9 10 * platform/mac/fast/forms/color/input-appearance-color-expected.png: 11 * platform/mac/fast/forms/color/input-appearance-color-expected.txt: 12 1 13 2018-08-28 Youenn Fablet <youenn@apple.com> 2 14 -
trunk/LayoutTests/platform/mac/fast/forms/color/input-appearance-color-expected.txt
r234788 r235435 13 13 RenderBlock {INPUT} at (0,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 14 14 RenderFlexibleBox {DIV} at (3,1) size 38x21 15 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#000000] [border: (1px solid #8A8A8A)]15 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#000000] 16 16 RenderBlock {INPUT} at (44,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 17 17 RenderFlexibleBox {DIV} at (3,1) size 38x21 18 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#000000] [border: (1px solid #8A8A8A)]18 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#000000] 19 19 RenderText {#text} at (0,0) size 0x0 20 20 RenderBlock {H3} at (0,100) size 784x23 … … 27 27 RenderBlock {INPUT} at (0,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 28 28 RenderFlexibleBox {DIV} at (3,1) size 38x21 29 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#00FF00] [border: (1px solid #8A8A8A)]29 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#00FF00] 30 30 RenderText {#text} at (44,21) size 4x18 31 31 text run at (44,21) width 4: " " 32 32 RenderBlock {INPUT} at (48,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 33 33 RenderFlexibleBox {DIV} at (3,1) size 38x21 34 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#00FF00] [border: (1px solid #8A8A8A)]34 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#00FF00] 35 35 RenderText {#text} at (92,21) size 4x18 36 36 text run at (92,21) width 4: " " 37 37 RenderBlock {INPUT} at (96,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 38 38 RenderFlexibleBox {DIV} at (3,1) size 38x21 39 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#00FF00] [border: (1px solid #8A8A8A)]39 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#00FF00] 40 40 RenderText {#text} at (140,21) size 4x18 41 41 text run at (140,21) width 4: " " 42 42 RenderBlock {INPUT} at (144,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 43 43 RenderFlexibleBox {DIV} at (3,1) size 38x21 44 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#00FF00] [border: (1px solid #8A8A8A)]44 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#00FF00] 45 45 RenderText {#text} at (188,21) size 4x18 46 46 text run at (188,21) width 4: " " 47 47 RenderBlock {INPUT} at (192,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 48 48 RenderFlexibleBox {DIV} at (3,1) size 38x21 49 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#00FF00] [border: (1px solid #8A8A8A)]49 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#00FF00] 50 50 RenderText {#text} at (236,21) size 4x18 51 51 text run at (236,21) width 4: " " 52 52 RenderBlock {INPUT} at (240,18) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 53 53 RenderFlexibleBox {DIV} at (3,1) size 38x21 54 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#00FF00] [border: (1px solid #8A8A8A)]54 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#00FF00] 55 55 RenderText {#text} at (0,0) size 0x0 56 56 RenderBlock {H3} at (0,200) size 784x23 … … 60 60 RenderBlock {INPUT} at (0,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 61 61 RenderFlexibleBox {DIV} at (3,1) size 38x21 62 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#FF0000] [border: (1px solid #8A8A8A)]62 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#FF0000] 63 63 RenderText {#text} at (44,3) size 4x18 64 64 text run at (44,3) width 4: " " 65 65 RenderBlock {INPUT} at (48,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 66 66 RenderFlexibleBox {DIV} at (3,1) size 38x21 67 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#00FF00] [border: (1px solid #8A8A8A)]67 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#00FF00] 68 68 RenderText {#text} at (92,3) size 4x18 69 69 text run at (92,3) width 4: " " 70 70 RenderBlock {INPUT} at (96,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 71 71 RenderFlexibleBox {DIV} at (3,1) size 38x21 72 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#0000FF] [border: (1px solid #8A8A8A)]72 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#0000FF] 73 73 RenderText {#text} at (140,3) size 4x18 74 74 text run at (140,3) width 4: " " 75 75 RenderBlock {INPUT} at (144,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 76 76 RenderFlexibleBox {DIV} at (3,1) size 38x21 77 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#EC008C] [border: (1px solid #8A8A8A)]77 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#EC008C] 78 78 RenderText {#text} at (188,3) size 4x18 79 79 text run at (188,3) width 4: " " 80 80 RenderBlock {INPUT} at (192,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 81 81 RenderFlexibleBox {DIV} at (3,1) size 38x21 82 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#40E0D0] [border: (1px solid #8A8A8A)]82 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#40E0D0] 83 83 RenderText {#text} at (236,3) size 4x18 84 84 text run at (236,3) width 4: " " 85 85 RenderBlock {INPUT} at (240,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 86 86 RenderFlexibleBox {DIV} at (3,1) size 38x21 87 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#FF0000] [border: (1px solid #8A8A8A)]87 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#FF0000] 88 88 RenderText {#text} at (284,3) size 4x18 89 89 text run at (284,3) width 4: " " 90 90 RenderBlock {INPUT} at (288,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 91 91 RenderFlexibleBox {DIV} at (3,1) size 38x21 92 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#00FF00] [border: (1px solid #8A8A8A)]92 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#00FF00] 93 93 RenderText {#text} at (332,3) size 4x18 94 94 text run at (332,3) width 4: " " 95 95 RenderBlock {INPUT} at (336,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 96 96 RenderFlexibleBox {DIV} at (3,1) size 38x21 97 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#0000FF] [border: (1px solid #8A8A8A)]97 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#0000FF] 98 98 RenderText {#text} at (380,3) size 4x18 99 99 text run at (380,3) width 4: " " 100 100 RenderBlock {INPUT} at (384,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 101 101 RenderFlexibleBox {DIV} at (3,1) size 38x21 102 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#EC008C] [border: (1px solid #8A8A8A)]102 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#EC008C] 103 103 RenderText {#text} at (428,3) size 4x18 104 104 text run at (428,3) width 4: " " 105 105 RenderBlock {INPUT} at (432,0) size 44x23 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 106 106 RenderFlexibleBox {DIV} at (3,1) size 38x21 107 RenderBlock {DIV} at (2,4) size 34x1 3 [bgcolor=#40E0D0] [border: (1px solid #8A8A8A)]107 RenderBlock {DIV} at (2,4) size 34x12 [bgcolor=#40E0D0] 108 108 RenderText {#text} at (0,0) size 0x0 109 109 RenderBlock {H3} at (0,283) size 784x23 … … 113 113 RenderBlock {INPUT} at (0,0) size 100x30 [bgcolor=#FFFFFF] [border: none (2px inset #000000) none (2px inset #000000)] 114 114 RenderFlexibleBox {DIV} at (3,1) size 94x28 115 RenderBlock {DIV} at (2,4) size 90x 20 [bgcolor=#FF0000] [border: (1px solid #8A8A8A)]115 RenderBlock {DIV} at (2,4) size 90x19 [bgcolor=#FF0000] -
trunk/Source/WebCore/ChangeLog
r235429 r235435 1 2018-08-28 Aditya Keerthi <akeerthi@apple.com> 2 3 [macOS] Color wells should appear rounded and textured 4 https://bugs.webkit.org/show_bug.cgi?id=189039 5 6 Reviewed by Tim Horton. 7 8 Color wells should have a rounded and textured appearance on macOS. We can use 9 NSBezelStyleTexturedSquare to achieve this appearance. 10 11 Also updated the user-agent stylesheet to match the system appearance. 12 13 Rebaselined existing test: fast/forms/color/input-appearance-color.html 14 15 * css/html.css: 16 (input[type="color"]::-webkit-color-swatch-wrapper): 17 (input[type="color"]::-webkit-color-swatch): 18 * platform/mac/ThemeMac.mm: 19 (WebCore::setUpButtonCell): 20 * rendering/RenderThemeMac.h: Build fix. 21 1 22 2018-08-28 Youenn Fablet <youenn@apple.com> 2 23 -
trunk/Source/WebCore/css/html.css
r234898 r235435 897 897 input[type="color"]::-webkit-color-swatch-wrapper { 898 898 display: flex; 899 padding: 4px 2px ;899 padding: 4px 2px 5px; 900 900 box-sizing: border-box; 901 901 width: 100%; … … 905 905 input[type="color"]::-webkit-color-swatch { 906 906 background-color: #000000; 907 border : 1px solid #8A8A8A;907 border-radius: 2px; 908 908 flex: 1; 909 909 } -
trunk/Source/WebCore/platform/mac/ThemeMac.mm
r234788 r235435 497 497 // Set the control size based off the rectangle we're painting into. 498 498 const std::array<IntSize, 3>& sizes = buttonSizes(); 499 if (part == SquareButtonPart 499 switch (part) { 500 case SquareButtonPart: 501 [cell setBezelStyle:NSBezelStyleShadowlessSquare]; 502 break; 500 503 #if ENABLE(INPUT_TYPE_COLOR) 501 || part == ColorWellPart 504 case ColorWellPart: 505 [cell setBezelStyle:NSBezelStyleTexturedSquare]; 506 break; 502 507 #endif 503 || zoomedSize.height() > buttonSizes()[NSControlSizeRegular].height() * zoomFactor) { 504 // Use the square button 505 if ([cell bezelStyle] != NSBezelStyleShadowlessSquare) 506 [cell setBezelStyle:NSBezelStyleShadowlessSquare]; 507 } else if ([cell bezelStyle] != NSBezelStyleRounded) 508 [cell setBezelStyle:NSBezelStyleRounded]; 508 default: 509 NSBezelStyle style = (zoomedSize.height() > buttonSizes()[NSControlSizeRegular].height() * zoomFactor) ? NSBezelStyleShadowlessSquare : NSBezelStyleRounded; 510 [cell setBezelStyle:style]; 511 break; 512 } 509 513 510 514 setControlSize(cell, sizes, zoomedSize, zoomFactor); -
trunk/Source/WebCore/rendering/RenderThemeMac.h
r235380 r235435 158 158 #if ENABLE(DATALIST_ELEMENT) 159 159 void paintListButtonForInput(const RenderObject&, GraphicsContext&, const FloatRect&); 160 void adjustListButtonStyle(StyleResolver&, RenderStyle&, const Element*) const ;160 void adjustListButtonStyle(StyleResolver&, RenderStyle&, const Element*) const final; 161 161 #endif 162 162 -
trunk/Source/WebKit/ChangeLog
r235427 r235435 1 2018-08-28 Aditya Keerthi <akeerthi@apple.com> 2 3 [macOS] Color wells should appear rounded and textured 4 https://bugs.webkit.org/show_bug.cgi?id=189039 5 6 Reviewed by Tim Horton. 7 8 * UIProcess/mac/WebColorPickerMac.mm: Build fix. 9 1 10 2018-08-28 Aditya Keerthi <akeerthi@apple.com> 2 11 -
trunk/Source/WebKit/UIProcess/mac/WebColorPickerMac.mm
r235403 r235435 64 64 @private 65 65 BOOL _lastChangedByUser; 66 Web ColorPickerMac *_picker;66 WebKit::WebColorPickerMac *_picker; 67 67 RetainPtr<WKPopoverColorWell> _popoverWell; 68 68 }
Note: See TracChangeset
for help on using the changeset viewer.