Changeset 229336 in webkit

Timestamp:

Mar 6, 2018 12:20:29 PM (6 years ago)

Author:

Megan Gardner

Message:

Ensure system appearance is default for web content
​https://bugs.webkit.org/show_bug.cgi?id=183354
<rdar://problem/36975571>
<rdar://problem/38162381>

Make sure the the system appearance for web content is default, and
consolidate that code to a single class.

Reviewed by Tim Horton.

Not currently testable, will add tests in a future patch.

• WebCore.xcodeproj/project.pbxproj:
• platform/mac/LocalDefaultSystemAppearance.h: Added.
• platform/mac/LocalDefaultSystemAppearance.mm: Added.

(WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance):
(WebCore::LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance):

• platform/mac/ThemeMac.mm:

(-[WebCoreThemeView init]):
(WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext):

• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::systemColor const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• platform/mac/LocalDefaultSystemAppearance.h (added)
• platform/mac/LocalDefaultSystemAppearance.mm (added)
• platform/mac/ThemeMac.mm (modified) (3 diffs)
• rendering/RenderThemeMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-06  Megan Gardner  <megan_gardner@apple.com>
+
+        Ensure system appearance is default for web content
+        https://bugs.webkit.org/show_bug.cgi?id=183354
+        <rdar://problem/36975571>
+        <rdar://problem/38162381>
+
+        Make sure the the system appearance for web content is default, and
+        consolidate that code to a single class.
+
+        Reviewed by Tim Horton.
+
+        Not currently testable, will add tests in a future patch.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/mac/LocalDefaultSystemAppearance.h: Added.
+        * platform/mac/LocalDefaultSystemAppearance.mm: Added.
+        (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance):
+        (WebCore::LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance):
+        * platform/mac/ThemeMac.mm:
+        (-[WebCoreThemeView init]):
+        (WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::systemColor const):
+
 2018-03-06  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1173 +1173 @@
                 4415292E0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4415292C0E1AE8A000C4A2D0 /* HTMLPlugInImageElement.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 443918001A91B2F8006E04F2 /* QuickLookSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 443917FE1A91B2F8006E04F2 /* QuickLookSoftLink.h */; };
+                445775E520472F73008DCE5D /* LocalDefaultSystemAppearance.h in Headers */ = {isa = PBXBuildFile; fileRef = 445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */; };
+                445775EA2047303C008DCE5D /* LocalDefaultSystemAppearance.mm in Sources */ = {isa = PBXBuildFile; fileRef = 445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */; };
                 447958041643B49A001E0A7F /* ParsedContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 447958031643B47B001E0A7F /* ParsedContentType.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 448A29BF0A46D9CB0030759F /* JSHTMLOptionsCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 448A29BD0A46D9CB0030759F /* JSHTMLOptionsCollection.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7376 +7378 @@
                 443F04260E75C8FB007E5407 /* NetworkStateNotifierIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkStateNotifierIOS.mm; sourceTree = "<group>"; };
                 444D4E210F708B2E003158E0 /* WebCoreURLResponseIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponseIOS.mm; sourceTree = "<group>"; };
+                445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalDefaultSystemAppearance.h; sourceTree = "<group>"; };
+                445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LocalDefaultSystemAppearance.mm; sourceTree = "<group>"; };
                 4476531A133170990006B789 /* SSLKeyGeneratorIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SSLKeyGeneratorIOS.cpp; sourceTree = "<group>"; };
                 447958021643B47B001E0A7F /* ParsedContentType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParsedContentType.cpp; sourceTree = "<group>"; };
@@ -18828 +18832 @@
                                 06E81ED60AB5D5E900C87837 /* LocalCurrentGraphicsContext.h */,
                                 06E81EEB0AB5DA9700C87837 /* LocalCurrentGraphicsContext.mm */,
+                                445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */,
+                                445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */,
                                 1402645D0AFDC19B005919E2 /* LoggingMac.mm */,
                                 CD8ACA8C1D23971900ECC59E /* MediaRemoteSoftLink.cpp */,
@@ -28888 +28894 @@
                                 8A12E35D11FA33280025836A /* LoadTiming.h in Headers */,
                                 06E81ED70AB5D5E900C87837 /* LocalCurrentGraphicsContext.h in Headers */,
+                                445775E520472F73008DCE5D /* LocalDefaultSystemAppearance.h in Headers */,
                                 F5973DE015CFB2030027F804 /* LocaleMac.h in Headers */,
                                 7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */,
@@ -31053 +31060 @@
                                 417612B11E3A994000C3D81D /* LibWebRTCPeerConnectionBackend.cpp in Sources */,
                                 9759E93E14EF1CF80026A2DD /* LoadableTextTrack.cpp in Sources */,
+                                445775EA2047303C008DCE5D /* LocalDefaultSystemAppearance.mm in Sources */,
                                 FABE72FE1059C21100D999DD /* MathMLNames.cpp in Sources */,
                                 2D9BF7051DBFBB24007A7D99 /* MediaEncryptedEvent.cpp in Sources */,

trunk/Source/WebCore/platform/mac/ThemeMac.mm

@@ -35 +35 @@
 #import "LengthSize.h"
 #import "LocalCurrentGraphicsContext.h"
+#import "LocalDefaultSystemAppearance.h"
 #import "ScrollView.h"
 #import <Carbon/Carbon.h>
@@ -67 +68 @@
 
 @implementation WebCoreThemeView
+
+- (instancetype)init
+{
+    if (!(self = [super init]))
+        return nil;
+    
+    WebCore::LocalDefaultSystemAppearance localAppearence;
+    [self setAppearance:[NSAppearance currentAppearance]];
+    return self;
+}
 
 - (NSWindow *)window
@@ -677 +688 @@
 {
     ASSERT(drawButtonCell || drawFocusRing);
+    LocalDefaultSystemAppearance localAppearence;
     bool needsRepaint = false;
     if (useImageBuffer) {

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -46 +46 @@
 #import "ImageBuffer.h"
 #import "LocalCurrentGraphicsContext.h"
+#import "LocalDefaultSystemAppearance.h"
 #import "LocalizedStrings.h"
 #import "MediaControlElements.h"
@@ -495 +496 @@
 Color RenderThemeMac::systemColor(CSSValueID cssValueID) const
 {
+    LocalDefaultSystemAppearance localAppearence;
     return m_systemColorCache.ensure(cssValueID, [this, cssValueID] () -> Color {
         auto selectCocoaColor = [cssValueID] () -> SEL {