WebKit Bugzilla
Attachment 343387 Details for
Bug 186819
: Corner of two scroll bars is white with dark mode enabled
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-186819-20180622160410.patch (text/plain), 37.23 KB, created by
Timothy Hatcher
on 2018-06-22 16:04:11 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Timothy Hatcher
Created:
2018-06-22 16:04:11 PDT
Size:
37.23 KB
patch
obsolete
>Subversion Revision: 233102 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index a4d6ab9a663abd14de62f798d6fe3f1a9095442b..aed189e0106db882503e18d43f4859a23d29d444 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,42 @@ >+2018-06-22 Timothy Hatcher <timothy@apple.com> >+ >+ Corner of two scroll bars is white with dark mode enabled. >+ https://bugs.webkit.org/show_bug.cgi?id=186819 >+ rdar://problem/40434350 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Configurations/WebCore.xcconfig: >+ * WebCore.xcodeproj/project.pbxproj: >+ * inspector/InspectorOverlay.cpp: >+ (WebCore::InspectorOverlay::paint): Added LocalDefaultSystemAppearance. >+ * page/Page.h: >+ * platform/ScrollView.cpp: >+ (WebCore::ScrollView::paintScrollCorner): Dropped ScrollView argument. >+ * platform/ScrollbarTheme.h: >+ (WebCore::ScrollbarTheme::paintScrollCorner): Ditto. >+ * platform/ScrollbarThemeComposite.cpp: >+ (WebCore::ScrollbarThemeComposite::paintScrollCorner): Deleted. Default is the same. >+ * platform/ScrollbarThemeComposite.h: >+ * platform/mac/LocalDefaultSystemAppearance.h: >+ * platform/mac/LocalDefaultSystemAppearance.mm: >+ (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance): Added recursion early return. >+ (WebCore::LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance): Ditto. >+ * platform/mac/ScrollbarThemeMac.h: >+ * platform/mac/ScrollbarThemeMac.mm: >+ (WebCore::ScrollbarThemeMac::paintScrollCorner): Added. >+ * rendering/RenderLayer.cpp: >+ (WebCore::RenderLayer::paintScrollCorner): Call ScrollbarTheme::paintScrollCorner. >+ * rendering/RenderLayerBacking.cpp: >+ (WebCore::RenderLayerBacking::paintContents): Added LocalDefaultSystemAppearance. >+ * rendering/RenderLayerCompositor.cpp: >+ (WebCore::RenderLayerCompositor::paintContents): Added LocalDefaultSystemAppearance. >+ * rendering/RenderScrollbarTheme.cpp: >+ (WebCore::RenderScrollbarTheme::paintScrollCorner): Call ScrollbarTheme::paintScrollCorner. >+ * rendering/RenderScrollbarTheme.h: >+ * svg/graphics/SVGImage.cpp: >+ (WebCore::SVGImage::draw): Added LocalDefaultSystemAppearance. >+ > 2018-06-22 Youenn Fablet <youenn@apple.com> > > Incoming G722 doesn't work >diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog >index 84b85a8e978d02afdd67ceb931662895a2a57363..08016fe70978726abc5bac141a78aafa08e47412 100644 >--- a/Source/WebCore/PAL/ChangeLog >+++ b/Source/WebCore/PAL/ChangeLog >@@ -1,3 +1,15 @@ >+2018-06-22 Timothy Hatcher <timothy@apple.com> >+ >+ Corner of two scroll bars is white with dark mode enabled. >+ https://bugs.webkit.org/show_bug.cgi?id=186819 >+ rdar://problem/40434350 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * PAL.xcodeproj/project.pbxproj: >+ * pal/spi/mac/CoreUISPI.h: Added. >+ * pal/spi/mac/NSAppearanceSPI.h: Added. >+ > 2018-06-21 Ryan Haddad <ryanhaddad@apple.com> > > Unreviewed attempt to fix the build after r233052. >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 7d7cdce1dcd3ab75a0e2b0e227056d077c531b51..ee03ac2415cabf879e1a3b406be3ffae29fcc664 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,20 @@ >+2018-06-22 Timothy Hatcher <timothy@apple.com> >+ >+ Corner of two scroll bars is white with dark mode enabled. >+ https://bugs.webkit.org/show_bug.cgi?id=186819 >+ rdar://problem/40434350 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * UIProcess/mac/WKPrintingView.mm: >+ (-[WKPrintingView drawRect:]): Added LocalDefaultSystemAppearance. >+ * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp: >+ (WebKit::InjectedBundleRangeHandle::renderedImage): Ditto. >+ * WebProcess/Plugins/PDF/PDFPlugin.mm: >+ (WebKit::PDFPlugin::paintControlForLayerInContext): Ditto. Dropped ScrollView argument. >+ * WebProcess/WebPage/WebPage.cpp: >+ (WebKit::WebPage::drawRect): Added LocalDefaultSystemAppearance. >+ > 2018-06-22 Brian Burg <bburg@apple.com> > > [Cocoa] REGRESSION(W3C): actions for key equivalents are not respected >diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig >index 29b680620f61f5452f8459175027912600dd37cd..29863fe8faeb28ded9892fd0284f12d0f2c4eadb 100644 >--- a/Source/WebCore/Configurations/WebCore.xcconfig >+++ b/Source/WebCore/Configurations/WebCore.xcconfig >@@ -80,6 +80,9 @@ WK_AUDIO_UNIT_LDFLAGS_macosx = -framework AudioUnit; > WK_CARBON_LDFLAGS = $(WK_CARBON_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_CARBON_LDFLAGS_macosx = -framework Carbon; > >+WK_CORE_UI_LDFLAGS = $(WK_CORE_UI_LDFLAGS_$(WK_PLATFORM_NAME)); >+WK_CORE_UI_LDFLAGS_macosx = -framework CoreUI; >+ > WK_DATA_DETECTORS_CORE_LDFLAGS = $(WK_DATA_DETECTORS_CORE_LDFLAGS_$(WK_PLATFORM_NAME)); > WK_DATA_DETECTORS_CORE_LDFLAGS_macosx = -framework DataDetectorsCore; > >@@ -126,7 +129,7 @@ WK_URL_FORMATTING_LDFLAGS = $(WK_URL_FORMATTING_LDFLAGS_$(WK_HAVE_URL_FORMATTING > WK_URL_FORMATTING_LDFLAGS_YES = -framework URLFormatting; > > // FIXME: Reduce the number of allowable_clients <rdar://problem/31823969> >-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS); >+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(WK_UNDEFINED_SYMBOLS_LDFLAGS) -lsqlite3 -lobjc -lANGLE -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_DEVICE_IDENTITY_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_OPENGL_LDFLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_SYSTEM_PREVIEW_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS); > > OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI; > OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit; >diff --git a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >index 1b00b1628e8d9b490e760ca338417d747ae9cacc..446f2d03511a44f44f9b91219e60cf2b705aa1a9 100644 >--- a/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >+++ b/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj >@@ -105,6 +105,8 @@ > 1C09D0581E31C57E00725F18 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0571E31C57E00725F18 /* config.h */; }; > 1C4876D81F8D7F4E00CCEEBD /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4876D61F8D7F4E00CCEEBD /* Logging.cpp */; }; > 1C4876D91F8D7F4E00CCEEBD /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C4876D71F8D7F4E00CCEEBD /* Logging.h */; }; >+ 1CCEE4F520D871930047B097 /* CoreUISPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CCEE4F420D871930047B097 /* CoreUISPI.h */; }; >+ 1CCEE4F720D8743F0047B097 /* NSAppearanceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CCEE4F620D8743F0047B097 /* NSAppearanceSPI.h */; }; > 2D02E93C2056FAA700A13797 /* AudioToolboxSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D02E93B2056FAA700A13797 /* AudioToolboxSPI.h */; }; > 31308B1420A21705003FB929 /* SystemPreviewSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 31308B1320A21705003FB929 /* SystemPreviewSPI.h */; }; > 570AB8F120AE2E8D00B8BE87 /* SecKeyProxySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 570AB8F020AE2E8D00B8BE87 /* SecKeyProxySPI.h */; }; >@@ -252,6 +254,8 @@ > 1C4876DC1F8D7FC600CCEEBD /* LogMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LogMacros.h; sourceTree = "<group>"; }; > 1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; }; > 1C67CEA21E32EE2600F80F2E /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; }; >+ 1CCEE4F420D871930047B097 /* CoreUISPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreUISPI.h; sourceTree = "<group>"; }; >+ 1CCEE4F620D8743F0047B097 /* NSAppearanceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAppearanceSPI.h; sourceTree = "<group>"; }; > 2D02E93B2056FAA700A13797 /* AudioToolboxSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioToolboxSPI.h; sourceTree = "<group>"; }; > 31308B1320A21705003FB929 /* SystemPreviewSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SystemPreviewSPI.h; sourceTree = "<group>"; }; > 37119A7820CCB5FF002C6DC9 /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; }; >@@ -417,6 +421,7 @@ > isa = PBXGroup; > children = ( > 0C7785701F45130F00F4EBB6 /* AVFoundationSPI.h */, >+ 1CCEE4F420D871930047B097 /* CoreUISPI.h */, > 0C7785711F45130F00F4EBB6 /* DataDetectorsSPI.h */, > A102658D1F567E9D00B4C844 /* HIServicesSPI.h */, > A10265881F56747A00B4C844 /* HIToolboxSPI.h */, >@@ -424,6 +429,7 @@ > 0C7785731F45130F00F4EBB6 /* MediaRemoteSPI.h */, > A1F55DCE1F5528EC00EDB75F /* MetadataSPI.h */, > 0C7785741F45130F00F4EBB6 /* NSAccessibilitySPI.h */, >+ 1CCEE4F620D8743F0047B097 /* NSAppearanceSPI.h */, > 0C7785751F45130F00F4EBB6 /* NSApplicationSPI.h */, > A1175B4A1F6B2D7E00C4B9F0 /* NSCellSPI.h */, > 0C7785761F45130F00F4EBB6 /* NSEventSPI.h */, >@@ -629,6 +635,7 @@ > 0CF99CA91F738437007EE793 /* CoreMediaSoftLink.h in Headers */, > 0C2DA0721F33CA8400DBC317 /* CoreMediaSPI.h in Headers */, > 0C2DA1401F3BEB4900DBC317 /* CoreTextSPI.h in Headers */, >+ 1CCEE4F520D871930047B097 /* CoreUISPI.h in Headers */, > 0C5AF9191F43A4C7002EAC02 /* CoreUISPI.h in Headers */, > 1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */, > 0C2DA1411F3BEB4900DBC317 /* DataDetectorsCoreSPI.h in Headers */, >@@ -660,6 +667,7 @@ > 0C5AF91E1F43A4C7002EAC02 /* MobileGestaltSPI.h in Headers */, > 0C2DA1491F3BEB4900DBC317 /* NEFilterSourceSPI.h in Headers */, > 0C77858D1F45130F00F4EBB6 /* NSAccessibilitySPI.h in Headers */, >+ 1CCEE4F720D8743F0047B097 /* NSAppearanceSPI.h in Headers */, > 0C77858E1F45130F00F4EBB6 /* NSApplicationSPI.h in Headers */, > 0C2DA14A1F3BEB4900DBC317 /* NSAttributedStringSPI.h in Headers */, > 0C2DA14B1F3BEB4900DBC317 /* NSButtonCellSPI.h in Headers */, >diff --git a/Source/WebCore/PAL/pal/spi/mac/CoreUISPI.h b/Source/WebCore/PAL/pal/spi/mac/CoreUISPI.h >new file mode 100644 >index 0000000000000000000000000000000000000000..689878771db3101aac042b9b9dcd0d3e7e39404a >--- /dev/null >+++ b/Source/WebCore/PAL/pal/spi/mac/CoreUISPI.h >@@ -0,0 +1,39 @@ >+/* >+ * Copyright (C) 2018 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY >+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR >+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, >+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR >+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY >+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#pragma once >+ >+#if USE(APPLE_INTERNAL_SDK) >+ >+#include <CoreUI/CoreUI.h> >+ >+#else >+ >+extern const CFStringRef kCUIWidgetKey; >+extern const CFStringRef kCUIIsFlippedKey; >+ >+extern const CFStringRef kCUIWidgetScrollBarTrackCorner; >+ >+#endif >diff --git a/Source/WebCore/PAL/pal/spi/mac/NSAppearanceSPI.h b/Source/WebCore/PAL/pal/spi/mac/NSAppearanceSPI.h >new file mode 100644 >index 0000000000000000000000000000000000000000..0730ff35a288ec7678fa7c417d29da1da8e18d60 >--- /dev/null >+++ b/Source/WebCore/PAL/pal/spi/mac/NSAppearanceSPI.h >@@ -0,0 +1,34 @@ >+/* >+ * Copyright (C) 2015 Apple Inc. All rights reserved. >+ * >+ * Redistribution and use in source and binary forms, with or without >+ * modification, are permitted provided that the following conditions >+ * are met: >+ * 1. Redistributions of source code must retain the above copyright >+ * notice, this list of conditions and the following disclaimer. >+ * 2. Redistributions in binary form must reproduce the above copyright >+ * notice, this list of conditions and the following disclaimer in the >+ * documentation and/or other materials provided with the distribution. >+ * >+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY >+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR >+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR >+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, >+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, >+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR >+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY >+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT >+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >+ */ >+ >+#if USE(APPKIT) >+ >+@interface NSAppearance () >+ >+- (void)_drawInRect:(NSRect)rect context:(CGContextRef)context options:(NSDictionary *)options; >+ >+@end >+ >+#endif // USE(APPKIT) >diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >index 747216060b1081e5088ca87b67161d2cff3ac49a..ea6827d749306ae24d3c2e19523011e7c7f49221 100644 >--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj >+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj >@@ -1192,7 +1192,7 @@ > 43EDD67F1B485DBF00640E75 /* CombinedFiltersAlphabet.h in Headers */ = {isa = PBXBuildFile; fileRef = 43EDD67D1B485DBF00640E75 /* CombinedFiltersAlphabet.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 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 */; }; >+ 445775E520472F73008DCE5D /* LocalDefaultSystemAppearance.h in Headers */ = {isa = PBXBuildFile; fileRef = 445775E420472F73008DCE5D /* LocalDefaultSystemAppearance.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 445775EA2047303C008DCE5D /* LocalDefaultSystemAppearance.mm in Sources */ = {isa = PBXBuildFile; fileRef = 445775E92047303B008DCE5D /* LocalDefaultSystemAppearance.mm */; }; > 4471710E205AF945000A116E /* MediaQueryParserContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4471710C205AF945000A116E /* MediaQueryParserContext.h */; settings = {ATTRIBUTES = (Private, ); }; }; > 447958041643B49A001E0A7F /* ParsedContentType.h in Headers */ = {isa = PBXBuildFile; fileRef = 447958031643B47B001E0A7F /* ParsedContentType.h */; settings = {ATTRIBUTES = (Private, ); }; }; >diff --git a/Source/WebCore/inspector/InspectorOverlay.cpp b/Source/WebCore/inspector/InspectorOverlay.cpp >index 328218f9c2c0362548172ec22ab19c1c9317f18c..1779bba78bf3bbc2f0325f3465c4f00e35f2aeb1 100644 >--- a/Source/WebCore/inspector/InspectorOverlay.cpp >+++ b/Source/WebCore/inspector/InspectorOverlay.cpp >@@ -40,6 +40,7 @@ > #include "InspectorClient.h" > #include "InspectorOverlayPage.h" > #include "LibWebRTCProvider.h" >+#include "LocalDefaultSystemAppearance.h" > #include "Node.h" > #include "Page.h" > #include "PageConfiguration.h" >@@ -177,6 +178,10 @@ void InspectorOverlay::paint(GraphicsContext& context) > if (!shouldShowOverlay()) > return; > >+#if PLATFORM(MAC) >+ LocalDefaultSystemAppearance localAppearance(m_page.useSystemAppearance(), m_page.defaultAppearance()); >+#endif >+ > GraphicsContextStateSaver stateSaver(context); > FrameView* view = overlayPage()->mainFrame().view(); > view->updateLayoutAndStyleIfNeededRecursive(); >diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h >index e88350a34df959d950488d291d408022ccf32b51..f8f42d643d84509644bccd261feba4cabe8cfe8c 100644 >--- a/Source/WebCore/page/Page.h >+++ b/Source/WebCore/page/Page.h >@@ -342,7 +342,7 @@ public: > bool useSystemAppearance() const { return m_useSystemAppearance; } > WEBCORE_EXPORT void setUseSystemAppearance(bool); > >- bool defaultAppearance() const; >+ WEBCORE_EXPORT bool defaultAppearance() const; > WEBCORE_EXPORT void setDefaultAppearance(bool); > > #if ENABLE(TEXT_AUTOSIZING) >diff --git a/Source/WebCore/platform/ScrollView.cpp b/Source/WebCore/platform/ScrollView.cpp >index 4f53ad7d827f9c455ecbac6bc61e6e3bf489da6c..2211b52895cc6cd5c53e8d0bc54f1bd96bc6cd19 100644 >--- a/Source/WebCore/platform/ScrollView.cpp >+++ b/Source/WebCore/platform/ScrollView.cpp >@@ -1122,7 +1122,7 @@ void ScrollView::scrollbarStyleChanged(ScrollbarStyle newStyle, bool forceUpdate > > void ScrollView::paintScrollCorner(GraphicsContext& context, const IntRect& cornerRect) > { >- ScrollbarTheme::theme().paintScrollCorner(this, context, cornerRect); >+ ScrollbarTheme::theme().paintScrollCorner(context, cornerRect); > } > > void ScrollView::paintScrollbar(GraphicsContext& context, Scrollbar& bar, const IntRect& rect) >diff --git a/Source/WebCore/platform/ScrollbarTheme.h b/Source/WebCore/platform/ScrollbarTheme.h >index b533d7fd254261b160dddec73831d9610082d33d..b291d7a0d49538aa8dafc1f535429a177bffaf41 100644 >--- a/Source/WebCore/platform/ScrollbarTheme.h >+++ b/Source/WebCore/platform/ScrollbarTheme.h >@@ -84,7 +84,7 @@ public: > > virtual void invalidatePart(Scrollbar&, ScrollbarPart) { } > >- virtual void paintScrollCorner(ScrollView*, GraphicsContext& context, const IntRect& cornerRect) { defaultPaintScrollCorner(context, cornerRect); } >+ virtual void paintScrollCorner(GraphicsContext& context, const IntRect& cornerRect) { defaultPaintScrollCorner(context, cornerRect); } > static void defaultPaintScrollCorner(GraphicsContext& context, const IntRect& cornerRect) { context.fillRect(cornerRect, Color::white); } > > virtual void paintTickmarks(GraphicsContext&, Scrollbar&, const IntRect&) { } >diff --git a/Source/WebCore/platform/ScrollbarThemeComposite.cpp b/Source/WebCore/platform/ScrollbarThemeComposite.cpp >index 46d9ee672d377f5823dc137ff323b4a359fcd5aa..00e526455d13093774f4a7bf2769d8f2e9bb383d 100644 >--- a/Source/WebCore/platform/ScrollbarThemeComposite.cpp >+++ b/Source/WebCore/platform/ScrollbarThemeComposite.cpp >@@ -260,11 +260,6 @@ int ScrollbarThemeComposite::trackLength(Scrollbar& scrollbar) > return (scrollbar.orientation() == HorizontalScrollbar) ? constrainedTrackRect.width() : constrainedTrackRect.height(); > } > >-void ScrollbarThemeComposite::paintScrollCorner(ScrollView*, GraphicsContext& context, const IntRect& cornerRect) >-{ >- context.fillRect(cornerRect, Color::white); >-} >- > IntRect ScrollbarThemeComposite::thumbRect(Scrollbar& scrollbar) > { > if (!hasThumb(scrollbar)) >diff --git a/Source/WebCore/platform/ScrollbarThemeComposite.h b/Source/WebCore/platform/ScrollbarThemeComposite.h >index 8ea6910281e52011851e008b62345bf2591bb49b..432678a45cc4fd4d01b601e2cd025685d4f38bd6 100644 >--- a/Source/WebCore/platform/ScrollbarThemeComposite.h >+++ b/Source/WebCore/platform/ScrollbarThemeComposite.h >@@ -44,7 +44,6 @@ public: > int thumbLength(Scrollbar&) override; > int trackPosition(Scrollbar&) override; > int trackLength(Scrollbar&) override; >- void paintScrollCorner(ScrollView*, GraphicsContext&, const IntRect& cornerRect) override; > void paintOverhangAreas(ScrollView&, GraphicsContext&, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) override; > > virtual bool hasButtons(Scrollbar&) = 0; >diff --git a/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.h b/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.h >index dedd9933753a927225df04775b454f2203dda886..a1a1845f8b6cd0f4d5e64af9a8d0692879316591 100644 >--- a/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.h >+++ b/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.h >@@ -39,8 +39,8 @@ namespace WebCore { > class LocalDefaultSystemAppearance { > WTF_MAKE_NONCOPYABLE(LocalDefaultSystemAppearance); > public: >- LocalDefaultSystemAppearance(bool useSystemAppearance, bool useDefaultAppearance); >- ~LocalDefaultSystemAppearance(); >+ WEBCORE_EXPORT LocalDefaultSystemAppearance(bool useSystemAppearance, bool useDefaultAppearance); >+ WEBCORE_EXPORT ~LocalDefaultSystemAppearance(); > private: > #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 > RetainPtr<NSAppearance> m_savedSystemAppearance; >diff --git a/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm b/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm >index bf9592d68ee681902d9b41ddf5919cb8deea4e42..40ecdfbb5df487440592c2e3eea634e63ee4ced7 100644 >--- a/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm >+++ b/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm >@@ -31,9 +31,14 @@ > > namespace WebCore { > >+static size_t recursionCount = 0; >+ > LocalDefaultSystemAppearance::LocalDefaultSystemAppearance(bool useSystemAppearance, bool useDefaultAppearance) > { > #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 >+ if (recursionCount++) >+ return; >+ > m_savedSystemAppearance = [NSAppearance currentAppearance]; > [NSAppearance setCurrentAppearance:[NSAppearance appearanceNamed:(!useSystemAppearance || useDefaultAppearance ? NSAppearanceNameAqua : NSAppearanceNameDarkAqua)]]; > #else >@@ -45,6 +50,9 @@ LocalDefaultSystemAppearance::LocalDefaultSystemAppearance(bool useSystemAppeara > LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance() > { > #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 >+ if (--recursionCount) >+ return; >+ > [NSAppearance setCurrentAppearance:m_savedSystemAppearance.get()]; > #endif > } >diff --git a/Source/WebCore/platform/mac/ScrollbarThemeMac.h b/Source/WebCore/platform/mac/ScrollbarThemeMac.h >index 10be37675ce3cefd2b691de4413b97324c5e6d62..3f0c0b59eaa75ca09999d6d3363480b2c8cf5590 100644 >--- a/Source/WebCore/platform/mac/ScrollbarThemeMac.h >+++ b/Source/WebCore/platform/mac/ScrollbarThemeMac.h >@@ -41,6 +41,7 @@ public: > void updateEnabledState(Scrollbar&) override; > > bool paint(Scrollbar&, GraphicsContext&, const IntRect& damageRect) override; >+ void paintScrollCorner(GraphicsContext&, const IntRect& cornerRect) override; > > int scrollbarThickness(ScrollbarControlSize = RegularScrollbar, ScrollbarExpansionState = ScrollbarExpansionState::Expanded) override; > >diff --git a/Source/WebCore/platform/mac/ScrollbarThemeMac.mm b/Source/WebCore/platform/mac/ScrollbarThemeMac.mm >index 5c2ca3ad6b3298db6364d2d1c6af9be59c22c256..24977733e78b6db73ed263bb14528cedb17f18ce 100644 >--- a/Source/WebCore/platform/mac/ScrollbarThemeMac.mm >+++ b/Source/WebCore/platform/mac/ScrollbarThemeMac.mm >@@ -38,6 +38,8 @@ > #import "ScrollView.h" > #import <Carbon/Carbon.h> > #import <pal/spi/cg/CoreGraphicsSPI.h> >+#import <pal/spi/mac/CoreUISPI.h> >+#import <pal/spi/mac/NSAppearanceSPI.h> > #import <pal/spi/mac/NSScrollerImpSPI.h> > #import <wtf/BlockObjCExceptions.h> > #import <wtf/HashMap.h> >@@ -554,7 +556,7 @@ bool ScrollbarThemeMac::paint(Scrollbar& scrollbar, GraphicsContext& context, co > return true; > > SetForScope<bool> isCurrentlyDrawingIntoLayer(g_isCurrentlyDrawingIntoLayer, context.isCALayerContext()); >- >+ > GraphicsContextStateSaver stateSaver(context); > context.clip(damageRect); > context.translate(scrollbar.frameRect().location()); >@@ -564,6 +566,18 @@ bool ScrollbarThemeMac::paint(Scrollbar& scrollbar, GraphicsContext& context, co > return true; > } > >+void ScrollbarThemeMac::paintScrollCorner(GraphicsContext& context, const IntRect& cornerRect) >+{ >+ auto cornerDrawingOptions = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks)); >+ >+ CFDictionarySetValue(cornerDrawingOptions.get(), kCUIWidgetKey, kCUIWidgetScrollBarTrackCorner); >+ CFDictionarySetValue(cornerDrawingOptions.get(), kCUIIsFlippedKey, kCFBooleanTrue); >+ >+ LocalCurrentGraphicsContext localContext(context); >+ >+ [[NSAppearance currentAppearance] _drawInRect:cornerRect context:localContext.cgContext() options:(__bridge NSDictionary *)cornerDrawingOptions.get()]; >+} >+ > #if ENABLE(RUBBER_BANDING) > static RetainPtr<CGColorRef> linenBackgroundColor() > { >diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp >index e107e44b7673b7bf5856895413e00da2a508dd88..c56048bcdcb7441f1d49c7f90e9b49d0cf29f791 100644 >--- a/Source/WebCore/rendering/RenderLayer.cpp >+++ b/Source/WebCore/rendering/RenderLayer.cpp >@@ -3710,10 +3710,10 @@ void RenderLayer::paintScrollCorner(GraphicsContext& context, const IntPoint& pa > return; > } > >- // We don't want to paint white if we have overlay scrollbars, since we need >+ // We don't want to paint a corner if we have overlay scrollbars, since we need > // to see what is behind it. > if (!hasOverlayScrollbars()) >- context.fillRect(absRect, Color::white); >+ ScrollbarTheme::theme().paintScrollCorner(context, absRect); > } > > void RenderLayer::drawPlatformResizerImage(GraphicsContext& context, const LayoutRect& resizerCornerRect) >diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp >index db39ab83e4ae4bcd03f346e7cf9adbcfa15eca47..be539c6e92a423c16a4fc9c542590f657e946650 100644 >--- a/Source/WebCore/rendering/RenderLayerBacking.cpp >+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp >@@ -47,6 +47,7 @@ > #include "HTMLPlugInElement.h" > #include "InspectorInstrumentation.h" > #include "KeyframeList.h" >+#include "LocalDefaultSystemAppearance.h" > #include "Logging.h" > #include "Page.h" > #include "PerformanceLoggingClient.h" >@@ -2580,6 +2581,10 @@ void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, Graph > renderer().page().setIsPainting(true); > #endif > >+#if PLATFORM(MAC) >+ LocalDefaultSystemAppearance localAppearance(renderer().page().useSystemAppearance(), renderer().page().defaultAppearance()); >+#endif >+ > // The dirtyRect is in the coords of the painting root. > FloatRect adjustedClipRect = clip; > adjustedClipRect.move(m_subpixelOffsetFromRenderer); >diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp >index be80cda855bfe4a309d2553c767bae1d6df658af..2d59c64cf6c7b7587dc37451bd3f9fd31f5362b4 100644 >--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp >+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp >@@ -41,6 +41,7 @@ > #include "HTMLNames.h" > #include "HitTestResult.h" > #include "InspectorInstrumentation.h" >+#include "LocalDefaultSystemAppearance.h" > #include "Logging.h" > #include "NodeList.h" > #include "Page.h" >@@ -2769,6 +2770,10 @@ void paintScrollbar(Scrollbar* scrollbar, GraphicsContext& context, const IntRec > > void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& clip, GraphicsLayerPaintBehavior) > { >+#if PLATFORM(MAC) >+ LocalDefaultSystemAppearance localAppearance(page().useSystemAppearance(), page().defaultAppearance()); >+#endif >+ > IntRect pixelSnappedRectForIntegralPositionedItems = snappedIntRect(LayoutRect(clip)); > if (graphicsLayer == layerForHorizontalScrollbar()) > paintScrollbar(m_renderView.frameView().horizontalScrollbar(), context, pixelSnappedRectForIntegralPositionedItems); >diff --git a/Source/WebCore/rendering/RenderScrollbarTheme.cpp b/Source/WebCore/rendering/RenderScrollbarTheme.cpp >index 1692ddcaeb7e62362a1d3fc04c189b4460bc6fa4..36b71e364a2457dac75b380801bf4d9c6dcdb01e 100644 >--- a/Source/WebCore/rendering/RenderScrollbarTheme.cpp >+++ b/Source/WebCore/rendering/RenderScrollbarTheme.cpp >@@ -126,10 +126,9 @@ void RenderScrollbarTheme::didPaintScrollbar(GraphicsContext& context, Scrollbar > } > } > >-void RenderScrollbarTheme::paintScrollCorner(ScrollView*, GraphicsContext& context, const IntRect& cornerRect) >+void RenderScrollbarTheme::paintScrollCorner(GraphicsContext& context, const IntRect& cornerRect) > { >- // FIXME: Implement. >- context.fillRect(cornerRect, Color::white); >+ ScrollbarTheme::theme().paintScrollCorner(context, cornerRect); > } > > void RenderScrollbarTheme::paintScrollbarBackground(GraphicsContext& context, Scrollbar& scrollbar) >diff --git a/Source/WebCore/rendering/RenderScrollbarTheme.h b/Source/WebCore/rendering/RenderScrollbarTheme.h >index 6ed98a20b0d2713d783c1c3b341fc4d88c9673bd..61c76f85a22c0e35076f64abc06f11bf0caf7b8b 100644 >--- a/Source/WebCore/rendering/RenderScrollbarTheme.h >+++ b/Source/WebCore/rendering/RenderScrollbarTheme.h >@@ -43,7 +43,7 @@ public: > > bool supportsControlTints() const override { return true; } > >- void paintScrollCorner(ScrollView*, GraphicsContext&, const IntRect& cornerRect) override; >+ void paintScrollCorner(GraphicsContext&, const IntRect& cornerRect) override; > > ScrollbarButtonPressAction handleMousePressEvent(Scrollbar& scrollbar, const PlatformMouseEvent& event, ScrollbarPart pressedPart) override { return ScrollbarTheme::theme().handleMousePressEvent(scrollbar, event, pressedPart); } > >diff --git a/Source/WebCore/svg/graphics/SVGImage.cpp b/Source/WebCore/svg/graphics/SVGImage.cpp >index 58c25c66c88b574f991e46bc3aa2d4d153c572c0..921f28028d417bcdad9c87d33d4e0a80a458c682 100644 >--- a/Source/WebCore/svg/graphics/SVGImage.cpp >+++ b/Source/WebCore/svg/graphics/SVGImage.cpp >@@ -43,6 +43,7 @@ > #include "IntRect.h" > #include "JSDOMWindowBase.h" > #include "LibWebRTCProvider.h" >+#include "LocalDefaultSystemAppearance.h" > #include "Page.h" > #include "PageConfiguration.h" > #include "RenderSVGRoot.h" >@@ -319,6 +320,10 @@ ImageDrawResult SVGImage::draw(GraphicsContext& context, const FloatRect& dstRec > view->layoutContext().layout(); > } > >+#if PLATFORM(MAC) >+ LocalDefaultSystemAppearance localAppearance(m_page->useSystemAppearance(), m_page->defaultAppearance()); >+#endif >+ > view->paint(context, intersection(context.clipBounds(), enclosingIntRect(srcRect))); > > if (compositingRequiresTransparencyLayer) >diff --git a/Source/WebKit/UIProcess/mac/WKPrintingView.mm b/Source/WebKit/UIProcess/mac/WKPrintingView.mm >index 934297fd93298445b3a62dd3d4faf8d2ce28a2af..9f0d5a6a482ea1a95b35944d75a89d1931cb630f 100644 >--- a/Source/WebKit/UIProcess/mac/WKPrintingView.mm >+++ b/Source/WebKit/UIProcess/mac/WKPrintingView.mm >@@ -36,6 +36,7 @@ > #import "WebPageProxy.h" > #import <PDFKit/PDFKit.h> > #import <WebCore/GraphicsContext.h> >+#import <WebCore/LocalDefaultSystemAppearance.h> > #import <WebCore/WebCoreObjCExtras.h> > #import <wtf/RunLoop.h> > >@@ -563,9 +564,14 @@ - (void)drawRect:(NSRect)nsRect > > ASSERT(_printOperation == [NSPrintOperation currentOperation]); > >- if (!_webFrame->page()) >+ auto* page = _webFrame->page(); >+ if (!page) > return; > >+#if PLATFORM(MAC) >+ LocalDefaultSystemAppearance localAppearance(page->useSystemAppearance(), page->defaultAppearance()); >+#endif >+ > if ([self _isPrintingPreview]) { > [self _drawPreview:nsRect]; > return; >diff --git a/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp b/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp >index 7bd6a42e744506e4a5227e8c39990d85b25a9829..5c080031524912855f9434c20f00395c219aff21 100644 >--- a/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp >+++ b/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp >@@ -39,6 +39,7 @@ > #include <WebCore/GraphicsContext.h> > #include <WebCore/IntRect.h> > #include <WebCore/JSRange.h> >+#include <WebCore/LocalDefaultSystemAppearance.h> > #include <WebCore/Page.h> > #include <WebCore/Range.h> > #include <WebCore/VisibleSelection.h> >@@ -120,6 +121,10 @@ RefPtr<WebImage> InjectedBundleRangeHandle::renderedImage(SnapshotOptions option > if (!frameView) > return nullptr; > >+#if PLATFORM(MAC) >+ LocalDefaultSystemAppearance localAppearance(frame->page()->useSystemAppearance(), frame->page()->defaultAppearance()); >+#endif >+ > Ref<Frame> protector(*frame); > > VisibleSelection oldSelection = frame->selection().selection(); >diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm >index 203db1a4740f733cf518c7b69c1b57ac57f5732b..1a9b8f120bbf185de184b81409b3b6ce79ad274b 100644 >--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm >+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm >@@ -69,6 +69,7 @@ > #import <WebCore/HTMLFormElement.h> > #import <WebCore/HTMLPlugInElement.h> > #import <WebCore/LegacyNSPasteboardTypes.h> >+#import <WebCore/LocalDefaultSystemAppearance.h> > #import <WebCore/LocalizedStrings.h> > #import <WebCore/MouseEvent.h> > #import <WebCore/PDFDocumentImage.h> >@@ -1209,20 +1210,25 @@ void PDFPlugin::updateControlTints(GraphicsContext& graphicsContext) > > void PDFPlugin::paintControlForLayerInContext(CALayer *layer, CGContextRef context) > { >+#if PLATFORM(MAC) >+ auto* page = webFrame()->coreFrame()->page(); >+ LocalDefaultSystemAppearance localAppearance(page->useSystemAppearance(), page->defaultAppearance()); >+#endif >+ > GraphicsContext graphicsContext(context); > GraphicsContextStateSaver stateSaver(graphicsContext); >- >+ > graphicsContext.setIsCALayerContext(true); >- >+ > if (layer == m_scrollCornerLayer) { > IntRect scrollCornerRect = this->scrollCornerRect(); > graphicsContext.translate(-scrollCornerRect.x(), -scrollCornerRect.y()); >- ScrollbarTheme::theme().paintScrollCorner(nullptr, graphicsContext, scrollCornerRect); >+ ScrollbarTheme::theme().paintScrollCorner(graphicsContext, scrollCornerRect); > return; > } >- >+ > Scrollbar* scrollbar = nullptr; >- >+ > if (layer == m_verticalScrollbarLayer) > scrollbar = verticalScrollbar(); > else if (layer == m_horizontalScrollbarLayer) >@@ -1230,7 +1236,7 @@ void PDFPlugin::paintControlForLayerInContext(CALayer *layer, CGContextRef conte > > if (!scrollbar) > return; >- >+ > graphicsContext.translate(-scrollbar->x(), -scrollbar->y()); > scrollbar->paint(graphicsContext, scrollbar->frameRect()); > } >diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.cpp b/Source/WebKit/WebProcess/WebPage/WebPage.cpp >index 2a8c3215240a925b01fde7780344dd048cb434fb..e06195c53f6ac0fb0e8d5531e7b33e31c6f5ffcf 100644 >--- a/Source/WebKit/WebProcess/WebPage/WebPage.cpp >+++ b/Source/WebKit/WebProcess/WebPage/WebPage.cpp >@@ -175,6 +175,7 @@ > #include <WebCore/JSDOMExceptionHandling.h> > #include <WebCore/JSDOMWindow.h> > #include <WebCore/KeyboardEvent.h> >+#include <WebCore/LocalDefaultSystemAppearance.h> > #include <WebCore/MIMETypeRegistry.h> > #include <WebCore/MouseEvent.h> > #include <WebCore/NotImplemented.h> >@@ -1517,6 +1518,10 @@ void WebPage::scrollMainFrameIfNotAtMaxScrollPosition(const IntSize& scrollOffse > > void WebPage::drawRect(GraphicsContext& graphicsContext, const IntRect& rect) > { >+#if PLATFORM(MAC) >+ LocalDefaultSystemAppearance localAppearance(m_page->useSystemAppearance(), m_page->defaultAppearance()); >+#endif >+ > GraphicsContextStateSaver stateSaver(graphicsContext); > graphicsContext.clip(rect); >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=343387">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 186819
:
343098
|
343104
|
343105
|
343112
|
343172
|
343177
|
343184
|
343336
|
343387
|
343393
|
343394
|
343404