Diff
Modified: trunk/Source/WebCore/ChangeLog (233551 => 233552)
--- trunk/Source/WebCore/ChangeLog 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/ChangeLog 2018-07-06 00:38:10 UTC (rev 233552)
@@ -1,3 +1,72 @@
+2018-07-05 Timothy Hatcher <[email protected]>
+
+ Rename and flip the meaning of defaultAppearance to be useDarkAppearance.
+ https://bugs.webkit.org/show_bug.cgi?id=187369
+ rdar://problem/41870420
+
+ Reviewed by Tim Horton.
+
+ * Modules/mediasession/WebMediaSessionManager.cpp:
+ (WebCore::WebMediaSessionManager::showPlaybackTargetPicker):
+ * css/MediaQueryEvaluator.cpp:
+ (WebCore::prefersDarkInterfaceEvaluate):
+ * css/StyleColor.h:
+ * dom/Document.cpp:
+ (WebCore::Document::useDarkAppearance const):
+ (WebCore::Document::styleColorOptions const):
+ (WebCore::Document::useDefaultAppearance const): Deleted.
+ * dom/Document.h:
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::paint):
+ * page/Page.cpp:
+ (WebCore::Page::useDarkAppearance const):
+ (WebCore::Page::defaultAppearance const): Deleted.
+ * page/Page.h:
+ (WebCore::Page::setUseDarkAppearance):
+ (WebCore::Page::setDefaultAppearance): Deleted.
+ * platform/Theme.h:
+ * platform/graphics/MediaPlaybackTargetPicker.h:
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h:
+ * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+ (WebCore::MediaPlaybackTargetPickerMac::showPlaybackTargetPicker):
+ * platform/mac/DragImageMac.mm:
+ (WebCore::createDragImageForLink):
+ * platform/mac/LocalDefaultSystemAppearance.h:
+ * platform/mac/LocalDefaultSystemAppearance.mm:
+ (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance):
+ * platform/mac/ThemeMac.h:
+ * platform/mac/ThemeMac.mm:
+ (WebCore::ThemeMac::paint):
+ * platform/mock/MediaPlaybackTargetPickerMock.cpp:
+ (WebCore::MediaPlaybackTargetPickerMock::showPlaybackTargetPicker):
+ * platform/mock/MediaPlaybackTargetPickerMock.h:
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::resolveStyleForMarkedText):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintContents):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::paintContents):
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::paint):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::documentViewFor const):
+ (WebCore::RenderThemeMac::platformActiveSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::supportsSelectionForegroundColors const):
+ (WebCore::RenderThemeMac::platformActiveSelectionForegroundColor const):
+ (WebCore::RenderThemeMac::platformInactiveSelectionForegroundColor const):
+ (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::platformActiveListBoxSelectionForegroundColor const):
+ (WebCore::RenderThemeMac::platformInactiveListBoxSelectionForegroundColor const):
+ (WebCore::RenderThemeMac::platformActiveTextSearchHighlightColor const):
+ (WebCore::RenderThemeMac::colorCache const):
+ (WebCore::RenderThemeMac::systemColor const):
+ (WebCore::RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary):
+ (WebCore::RenderThemeMac::paintSliderThumb):
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::draw):
+
2018-07-05 Commit Queue <[email protected]>
Unreviewed, rolling out r233539.
Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (233551 => 233552)
--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -178,7 +178,7 @@
scheduleDelayedTask(TargetMonitoringConfigurationTask | TargetClientsConfigurationTask);
}
-void WebMediaSessionManager::showPlaybackTargetPicker(WebMediaSessionManagerClient& client, uint64_t contextId, const IntRect& rect, bool, bool useDefaultAppearance)
+void WebMediaSessionManager::showPlaybackTargetPicker(WebMediaSessionManagerClient& client, uint64_t contextId, const IntRect& rect, bool, bool useDarkAppearance)
{
size_t index = find(&client, contextId);
ASSERT(index != notFound);
@@ -193,7 +193,7 @@
bool hasActiveRoute = flagsAreSet(m_clientState[index]->flags, MediaProducer::IsPlayingToExternalDevice);
LOG(Media, "WebMediaSessionManager::showPlaybackTargetPicker(%p + %llu) - hasActiveRoute = %i", &client, contextId, (int)hasActiveRoute);
- targetPicker().showPlaybackTargetPicker(FloatRect(rect), hasActiveRoute, useDefaultAppearance);
+ targetPicker().showPlaybackTargetPicker(FloatRect(rect), hasActiveRoute, useDarkAppearance);
}
void WebMediaSessionManager::clientStateDidChange(WebMediaSessionManagerClient& client, uint64_t contextId, MediaProducer::MediaStateFlags newFlags)
Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (233551 => 233552)
--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -717,7 +717,7 @@
{
bool prefersDarkInterface = false;
- if (frame.page()->useSystemAppearance() && !frame.page()->defaultAppearance())
+ if (frame.page()->useSystemAppearance() && frame.page()->useDarkAppearance())
prefersDarkInterface = true;
if (!value)
Modified: trunk/Source/WebCore/css/StyleColor.h (233551 => 233552)
--- trunk/Source/WebCore/css/StyleColor.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/css/StyleColor.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -54,7 +54,7 @@
enum class Options : uint8_t {
ForVisitedLink = 1 << 0,
UseSystemAppearance = 1 << 1,
- UseDefaultAppearance = 1 << 2
+ UseDarkAppearance = 1 << 2
};
static Color colorFromKeyword(CSSValueID, OptionSet<Options>);
Modified: trunk/Source/WebCore/dom/Document.cpp (233551 => 233552)
--- trunk/Source/WebCore/dom/Document.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/dom/Document.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -7084,12 +7084,12 @@
return useSystemAppearance;
}
-bool Document::useDefaultAppearance() const
+bool Document::useDarkAppearance() const
{
- bool useDefaultAppearance = true;
+ bool useDarkAppearance = false;
if (Page* documentPage = page())
- useDefaultAppearance = documentPage->defaultAppearance();
- return useDefaultAppearance;
+ useDarkAppearance = documentPage->useDarkAppearance();
+ return useDarkAppearance;
}
OptionSet<StyleColor::Options> Document::styleColorOptions() const
@@ -7097,8 +7097,8 @@
OptionSet<StyleColor::Options> options;
if (useSystemAppearance())
options |= StyleColor::Options::UseSystemAppearance;
- if (useDefaultAppearance())
- options |= StyleColor::Options::UseDefaultAppearance;
+ if (useDarkAppearance())
+ options |= StyleColor::Options::UseDarkAppearance;
return options;
}
Modified: trunk/Source/WebCore/dom/Document.h (233551 => 233552)
--- trunk/Source/WebCore/dom/Document.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/dom/Document.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -553,7 +553,8 @@
float deviceScaleFactor() const;
bool useSystemAppearance() const;
- bool useDefaultAppearance() const;
+ bool useDarkAppearance() const;
+
OptionSet<StyleColor::Options> styleColorOptions() const;
WEBCORE_EXPORT Ref<Range> createRange();
Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (233551 => 233552)
--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -181,7 +181,7 @@
return;
#if PLATFORM(MAC)
- LocalDefaultSystemAppearance localAppearance(m_page.useSystemAppearance(), m_page.defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(m_page.useSystemAppearance(), m_page.useDarkAppearance());
#endif
GraphicsContextStateSaver stateSaver(context);
Modified: trunk/Source/WebCore/page/Page.cpp (233551 => 233552)
--- trunk/Source/WebCore/page/Page.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/page/Page.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -2385,12 +2385,12 @@
}
}
-bool Page::defaultAppearance() const
+bool Page::useDarkAppearance() const
{
FrameView* view = mainFrame().view();
if (!view || !equalLettersIgnoringASCIICase(view->mediaType(), "screen"))
- return true;
- return m_defaultAppearance;
+ return false;
+ return m_useDarkAppearance;
}
void Page::setFullscreenInsets(const FloatBoxExtent& insets)
Modified: trunk/Source/WebCore/page/Page.h (233551 => 233552)
--- trunk/Source/WebCore/page/Page.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/page/Page.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -342,8 +342,8 @@
bool useSystemAppearance() const { return m_useSystemAppearance; }
WEBCORE_EXPORT void setUseSystemAppearance(bool);
- WEBCORE_EXPORT bool defaultAppearance() const;
- void setDefaultAppearance(bool a) { m_defaultAppearance = a; }
+ WEBCORE_EXPORT bool useDarkAppearance() const;
+ void setUseDarkAppearance(bool a) { m_useDarkAppearance = a; }
#if ENABLE(TEXT_AUTOSIZING)
float textAutosizingWidth() const { return m_textAutosizingWidth; }
@@ -754,7 +754,7 @@
#endif
bool m_useSystemAppearance { false };
- bool m_defaultAppearance { true };
+ bool m_useDarkAppearance { false };
#if ENABLE(TEXT_AUTOSIZING)
float m_textAutosizingWidth { 0 };
Modified: trunk/Source/WebCore/platform/Theme.h (233551 => 233552)
--- trunk/Source/WebCore/platform/Theme.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/Theme.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -68,7 +68,7 @@
virtual bool controlRequiresPreWhiteSpace(ControlPart) const;
// Method for painting a control. The rect is in zoomed coordinates.
- virtual void paint(ControlPart, ControlStates&, GraphicsContext&, const FloatRect& zoomedRect, float zoomFactor, ScrollView*, float deviceScaleFactor, float pageScaleFactor, bool useSystemAppearance, bool useDefaultAppearance);
+ virtual void paint(ControlPart, ControlStates&, GraphicsContext&, const FloatRect& zoomedRect, float zoomFactor, ScrollView*, float deviceScaleFactor, float pageScaleFactor, bool useSystemAppearance, bool useDarkAppearance);
// Some controls may spill out of their containers (e.g., the check on an OS X checkbox). When these controls repaint,
// the theme needs to communicate this inflated rect to the engine so that it can invalidate the whole control.
Modified: trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h (233551 => 233552)
--- trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/graphics/MediaPlaybackTargetPicker.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -51,7 +51,7 @@
virtual ~MediaPlaybackTargetPicker();
- virtual void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute, bool useDefaultAppearance);
+ virtual void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute, bool useDarkAppearance);
virtual void startingMonitoringPlaybackTargets();
virtual void stopMonitoringPlaybackTargets();
virtual void invalidatePlaybackTargets();
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h (233551 => 233552)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -43,7 +43,7 @@
virtual ~MediaPlaybackTargetPickerMac();
- void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute, bool useDefaultAppearance) override;
+ void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute, bool useDarkAppearance) override;
void startingMonitoringPlaybackTargets() override;
void stopMonitoringPlaybackTargets() override;
void invalidatePlaybackTargets() override;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (233551 => 233552)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -110,7 +110,7 @@
return m_outputDeviceMenuController.get();
}
-void MediaPlaybackTargetPickerMac::showPlaybackTargetPicker(const FloatRect& location, bool checkActiveRoute, bool useDefaultAppearance)
+void MediaPlaybackTargetPickerMac::showPlaybackTargetPicker(const FloatRect& location, bool checkActiveRoute, bool useDarkAppearance)
{
if (!client() || m_showingMenu)
return;
@@ -119,7 +119,7 @@
m_showingMenu = true;
- if ([devicePicker() showMenuForRect:location appearanceName:useDefaultAppearance ? NSAppearanceNameVibrantLight : NSAppearanceNameVibrantDark allowReselectionOfSelectedOutputDevice:!checkActiveRoute]) {
+ if ([devicePicker() showMenuForRect:location appearanceName:(useDarkAppearance ? NSAppearanceNameVibrantDark : NSAppearanceNameVibrantLight) allowReselectionOfSelectedOutputDevice:!checkActiveRoute]) {
if (!checkActiveRoute)
currentDeviceDidChange();
}
Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (233551 => 233552)
--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -303,7 +303,7 @@
Page* page = element.document().page();
- LocalDefaultSystemAppearance localAppearance(true, page ? page->defaultAppearance() : true);
+ LocalDefaultSystemAppearance localAppearance(true, page ? page->useDarkAppearance() : false);
auto imageSize = layout.boundingRect.size();
#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
Modified: trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.h (233551 => 233552)
--- trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -40,7 +40,7 @@
WTF_MAKE_NONCOPYABLE(LocalDefaultSystemAppearance);
public:
- WEBCORE_EXPORT LocalDefaultSystemAppearance(bool useSystemAppearance, bool useDefaultAppearance);
+ WEBCORE_EXPORT LocalDefaultSystemAppearance(bool useSystemAppearance, bool useDarkAppearance);
WEBCORE_EXPORT ~LocalDefaultSystemAppearance();
bool usingDarkAppearance() const
Modified: trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm (233551 => 233552)
--- trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -35,7 +35,7 @@
static size_t recursionCount = 0;
#endif
-LocalDefaultSystemAppearance::LocalDefaultSystemAppearance(bool useSystemAppearance, bool useDefaultAppearance)
+LocalDefaultSystemAppearance::LocalDefaultSystemAppearance(bool useSystemAppearance, bool useDarkAppearance)
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
if (recursionCount++)
@@ -42,12 +42,12 @@
return;
m_savedSystemAppearance = [NSAppearance currentAppearance];
- m_usingDarkAppearance = useSystemAppearance && !useDefaultAppearance;
+ m_usingDarkAppearance = useSystemAppearance && useDarkAppearance;
[NSAppearance setCurrentAppearance:[NSAppearance appearanceNamed:m_usingDarkAppearance ? NSAppearanceNameDarkAqua : NSAppearanceNameAqua]];
#else
UNUSED_PARAM(useSystemAppearance);
- UNUSED_PARAM(useDefaultAppearance);
+ UNUSED_PARAM(useDarkAppearance);
#endif
}
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.h (233551 => 233552)
--- trunk/Source/WebCore/platform/mac/ThemeMac.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -53,7 +53,7 @@
bool controlRequiresPreWhiteSpace(ControlPart part) const final { return part == PushButtonPart; }
- void paint(ControlPart, ControlStates&, GraphicsContext&, const FloatRect&, float zoomFactor, ScrollView*, float deviceScaleFactor, float pageScaleFactor, bool useSystemAppearance, bool useDefaultAppearance) final;
+ void paint(ControlPart, ControlStates&, GraphicsContext&, const FloatRect&, float zoomFactor, ScrollView*, float deviceScaleFactor, float pageScaleFactor, bool useSystemAppearance, bool useDarkAppearance) final;
void inflateControlPaintRect(ControlPart, const ControlStates&, FloatRect&, float zoomFactor) const final;
bool userPrefersReducedMotion() const final;
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (233551 => 233552)
--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -848,9 +848,9 @@
END_BLOCK_OBJC_EXCEPTIONS
}
-void ThemeMac::paint(ControlPart part, ControlStates& states, GraphicsContext& context, const FloatRect& zoomedRect, float zoomFactor, ScrollView* scrollView, float deviceScaleFactor, float pageScaleFactor, bool useSystemAppearance, bool useDefaultAppearance)
+void ThemeMac::paint(ControlPart part, ControlStates& states, GraphicsContext& context, const FloatRect& zoomedRect, float zoomFactor, ScrollView* scrollView, float deviceScaleFactor, float pageScaleFactor, bool useSystemAppearance, bool useDarkAppearance)
{
- LocalDefaultSystemAppearance localAppearance(useSystemAppearance, useDefaultAppearance);
+ LocalDefaultSystemAppearance localAppearance(useSystemAppearance, useDarkAppearance);
switch (part) {
case CheckboxPart:
Modified: trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (233551 => 233552)
--- trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -70,7 +70,7 @@
currentDeviceDidChange();
}
-void MediaPlaybackTargetPickerMock::showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute, bool useDefaultAppearance)
+void MediaPlaybackTargetPickerMock::showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute, bool useDarkAppearance)
{
if (!client() || m_showingMenu)
return;
@@ -77,9 +77,9 @@
#if LOG_DISABLED
UNUSED_PARAM(checkActiveRoute);
- UNUSED_PARAM(useDefaultAppearance);
+ UNUSED_PARAM(useDarkAppearance);
#endif
- LOG(Media, "MediaPlaybackTargetPickerMock::showPlaybackTargetPicker - checkActiveRoute = %i, useDefaultAppearance = %i", (int)checkActiveRoute, (int)useDefaultAppearance);
+ LOG(Media, "MediaPlaybackTargetPickerMock::showPlaybackTargetPicker - checkActiveRoute = %i, useDarkAppearance = %i", (int)checkActiveRoute, (int)useDarkAppearance);
m_showingMenu = true;
m_timer.startOneShot(timerInterval);
Modified: trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h (233551 => 233552)
--- trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -41,7 +41,7 @@
virtual ~MediaPlaybackTargetPickerMock();
- void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute, bool useDefaultAppearance) override;
+ void showPlaybackTargetPicker(const FloatRect&, bool checkActiveRoute, bool useDarkAppearance) override;
void startingMonitoringPlaybackTargets() override;
void stopMonitoringPlaybackTargets() override;
void invalidatePlaybackTargets() override;
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (233551 => 233552)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -767,7 +767,7 @@
}
case MarkedText::TextMatch: {
// Text matches always use the light system appearance.
- OptionSet<StyleColor::Options> styleColorOptions = { StyleColor::Options::UseSystemAppearance, StyleColor::Options::UseDefaultAppearance };
+ OptionSet<StyleColor::Options> styleColorOptions = { StyleColor::Options::UseSystemAppearance, StyleColor::Options::UseDarkAppearance };
#if PLATFORM(MAC)
style.textStyles.fillColor = renderer().theme().systemColor(CSSValueAppleSystemLabel, styleColorOptions);
#endif
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (233551 => 233552)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -2586,7 +2586,7 @@
#endif
#if PLATFORM(MAC)
- LocalDefaultSystemAppearance localAppearance(renderer().page().useSystemAppearance(), renderer().page().defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(renderer().page().useSystemAppearance(), renderer().page().useDarkAppearance());
#endif
// The dirtyRect is in the coords of the painting root.
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (233551 => 233552)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -2774,7 +2774,7 @@
void RenderLayerCompositor::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase, const FloatRect& clip, GraphicsLayerPaintBehavior)
{
#if PLATFORM(MAC)
- LocalDefaultSystemAppearance localAppearance(page().useSystemAppearance(), page().defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(page().useSystemAppearance(), page().useDarkAppearance());
#endif
IntRect pixelSnappedRectForIntegralPositionedItems = snappedIntRect(LayoutRect(clip));
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (233551 => 233552)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -303,7 +303,7 @@
case ButtonPart:
case InnerSpinButtonPart:
updateControlStatesForRenderer(box, controlStates);
- Theme::singleton().paint(part, controlStates, paintInfo.context(), devicePixelSnappedRect, box.style().effectiveZoom(), &box.view().frameView(), deviceScaleFactor, pageScaleFactor, box.page().useSystemAppearance(), box.page().defaultAppearance());
+ Theme::singleton().paint(part, controlStates, paintInfo.context(), devicePixelSnappedRect, box.style().effectiveZoom(), &box.view().frameView(), deviceScaleFactor, pageScaleFactor, box.page().useSystemAppearance(), box.page().useDarkAppearance());
return false;
default:
break;
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (233551 => 233552)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -221,7 +221,7 @@
NSView *RenderThemeMac::documentViewFor(const RenderObject& o) const
{
- LocalDefaultSystemAppearance localAppearance(o.page().useSystemAppearance(), o.page().defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(o.page().useSystemAppearance(), o.page().useDarkAppearance());
ControlStates states(extractControlStatesForRenderer(o));
return ThemeMac::ensuredView(&o.view().frameView(), states);
}
@@ -316,7 +316,7 @@
Color RenderThemeMac::platformActiveSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
{
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
return colorFromNSColor([NSColor selectedTextBackgroundColor]);
}
@@ -323,7 +323,7 @@
Color RenderThemeMac::platformInactiveSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
return colorFromNSColor([NSColor unemphasizedSelectedTextBackgroundColor]);
#else
UNUSED_PARAM(options);
@@ -333,13 +333,13 @@
bool RenderThemeMac::supportsSelectionForegroundColors(OptionSet<StyleColor::Options> options) const
{
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
return localAppearance.usingDarkAppearance();
}
Color RenderThemeMac::platformActiveSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
{
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
if (localAppearance.usingDarkAppearance())
return colorFromNSColor([NSColor selectedTextColor]);
return { };
@@ -348,7 +348,7 @@
Color RenderThemeMac::platformInactiveSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
if (localAppearance.usingDarkAppearance())
return colorFromNSColor([NSColor unemphasizedSelectedTextColor]);
return { };
@@ -361,7 +361,7 @@
Color RenderThemeMac::platformActiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
return colorFromNSColor([NSColor selectedContentBackgroundColor]);
#else
UNUSED_PARAM(options);
@@ -372,7 +372,7 @@
Color RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor(OptionSet<StyleColor::Options> options) const
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
return colorFromNSColor([NSColor unemphasizedSelectedContentBackgroundColor]);
#else
UNUSED_PARAM(options);
@@ -382,7 +382,7 @@
Color RenderThemeMac::platformActiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
{
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
return colorFromNSColor([NSColor alternateSelectedControlTextColor]);
}
@@ -389,7 +389,7 @@
Color RenderThemeMac::platformInactiveListBoxSelectionForegroundColor(OptionSet<StyleColor::Options> options) const
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
return colorFromNSColor([NSColor unemphasizedSelectedTextColor]);
#else
UNUSED_PARAM(options);
@@ -407,7 +407,7 @@
Color RenderThemeMac::platformActiveTextSearchHighlightColor(OptionSet<StyleColor::Options> options) const
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDefaultAppearance));
+ LocalDefaultSystemAppearance localAppearance(options.contains(StyleColor::Options::UseSystemAppearance), options.contains(StyleColor::Options::UseDarkAppearance));
return colorFromNSColor([NSColor findHighlightColor]);
#else
UNUSED_PARAM(options);
@@ -525,8 +525,8 @@
auto RenderThemeMac::colorCache(OptionSet<StyleColor::Options> options) const -> ColorCache&
{
const bool useSystemAppearance = options.contains(StyleColor::Options::UseSystemAppearance);
- const bool useDefaultAppearance = options.contains(StyleColor::Options::UseDefaultAppearance);
- LocalDefaultSystemAppearance localAppearance(useSystemAppearance, useDefaultAppearance);
+ const bool useDarkAppearance = options.contains(StyleColor::Options::UseDarkAppearance);
+ LocalDefaultSystemAppearance localAppearance(useSystemAppearance, useDarkAppearance);
if (localAppearance.usingDarkAppearance())
return m_darkColorCache;
return RenderTheme::colorCache(options);
@@ -535,10 +535,10 @@
Color RenderThemeMac::systemColor(CSSValueID cssValueID, OptionSet<StyleColor::Options> options) const
{
const bool useSystemAppearance = options.contains(StyleColor::Options::UseSystemAppearance);
- const bool useDefaultAppearance = options.contains(StyleColor::Options::UseDefaultAppearance);
+ const bool useDarkAppearance = options.contains(StyleColor::Options::UseDarkAppearance);
const bool forVisitedLink = options.contains(StyleColor::Options::ForVisitedLink);
- LocalDefaultSystemAppearance localAppearance(useSystemAppearance, useDefaultAppearance);
+ LocalDefaultSystemAppearance localAppearance(useSystemAppearance, useDarkAppearance);
auto& cache = colorCache(options);
@@ -1605,7 +1605,7 @@
void RenderThemeMac::paintCellAndSetFocusedElementNeedsRepaintIfNecessary(NSCell* cell, const RenderObject& renderer, const PaintInfo& paintInfo, const FloatRect& rect)
{
- LocalDefaultSystemAppearance localAppearance(renderer.page().useSystemAppearance(), renderer.page().defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(renderer.page().useSystemAppearance(), renderer.page().useDarkAppearance());
bool shouldDrawFocusRing = isFocused(renderer) && renderer.style().outlineStyleIsAuto() == OutlineIsAuto::On;
bool shouldUseImageBuffer = renderer.style().effectiveZoom() != 1 || renderer.page().pageScaleFactor() != 1;
bool shouldDrawCell = true;
@@ -1687,7 +1687,7 @@
? sliderThumbVertical()
: sliderThumbHorizontal();
- LocalDefaultSystemAppearance localAppearance(o.page().useSystemAppearance(), o.page().defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(o.page().useSystemAppearance(), o.page().useDarkAppearance());
LocalCurrentGraphicsContext localContext(paintInfo.context());
Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (233551 => 233552)
--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -324,7 +324,7 @@
}
#if PLATFORM(MAC)
- LocalDefaultSystemAppearance localAppearance(m_page->useSystemAppearance(), m_page->defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(m_page->useSystemAppearance(), m_page->useDarkAppearance());
#endif
view->paint(context, intersection(context.clipBounds(), enclosingIntRect(srcRect)));
Modified: trunk/Source/WebKit/ChangeLog (233551 => 233552)
--- trunk/Source/WebKit/ChangeLog 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/ChangeLog 2018-07-06 00:38:10 UTC (rev 233552)
@@ -1,3 +1,55 @@
+2018-07-05 Timothy Hatcher <[email protected]>
+
+ Rename and flip the meaning of defaultAppearance to be useDarkAppearance.
+ https://bugs.webkit.org/show_bug.cgi?id=187369
+ rdar://problem/41870420
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode const):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _effectiveAppearanceIsDark]):
+ (-[WKWebView _initializeWithConfiguration:]):
+ (-[WKWebView _setUseSystemAppearance:]):
+ (-[WKWebView effectiveAppearanceDidChange]):
+ (-[WKWebView _defaultAppearance]): Deleted.
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView _effectiveAppearanceIsDark]):
+ (-[WKView effectiveAppearanceDidChange]):
+ (-[WKView _setUseSystemAppearance:]):
+ (-[WKView _defaultAppearance]): Deleted.
+ (-[WKView _setDefaultAppearance:]): Deleted.
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::effectiveAppearanceIsDark):
+ (WebKit::WebViewImpl::setUseDarkAppearance):
+ (WebKit::WebViewImpl::useDefaultAppearance): Deleted.
+ (WebKit::WebViewImpl::setDefaultAppearance): Deleted.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit::WebPageProxy::setUseDarkAppearance):
+ (WebKit::WebPageProxy::showPlaybackTargetPicker):
+ (WebKit::WebPageProxy::setDefaultAppearance): Deleted.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::useDarkAppearance const):
+ (WebKit::WebPageProxy::defaultAppearance const): Deleted.
+ * UIProcess/mac/WKPrintingView.mm:
+ (-[WKPrintingView drawRect:]):
+ * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:
+ (WebKit::InjectedBundleRangeHandle::renderedImage):
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::paintControlForLayerInContext):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_credentialsMessenger):
+ (WebKit::WebPage::drawRect):
+ (WebKit::WebPage::setUseDarkAppearance):
+ (WebKit::WebPage::setDefaultAppearance): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2018-07-05 Brian Burg <[email protected]>
REGRESSION: ASSERT under WebAutomationSessionProxy::computeElementLayout when elementInViewClientCenterPoint returns nullopt
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp (233551 => 233552)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -81,7 +81,7 @@
#if PLATFORM(MAC)
encoder << colorSpace;
encoder << useSystemAppearance;
- encoder << defaultAppearance;
+ encoder << useDarkAppearance;
#endif
#if PLATFORM(IOS)
encoder << screenSize;
@@ -239,7 +239,7 @@
return std::nullopt;
if (!decoder.decode(parameters.useSystemAppearance))
return std::nullopt;
- if (!decoder.decode(parameters.defaultAppearance))
+ if (!decoder.decode(parameters.useDarkAppearance))
return std::nullopt;
#endif
Modified: trunk/Source/WebKit/Shared/WebPageCreationParameters.h (233551 => 233552)
--- trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/Shared/WebPageCreationParameters.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -138,7 +138,7 @@
#if PLATFORM(MAC)
ColorSpaceData colorSpace;
bool useSystemAppearance;
- bool defaultAppearance;
+ bool useDarkAppearance;
#endif
#if PLATFORM(IOS)
WebCore::FloatSize screenSize;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (233551 => 233552)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -465,9 +465,9 @@
return static_cast<uint32_t>(WebCore::UserInterfaceLayoutDirection::LTR);
}
-- (bool)_defaultAppearance
+- (bool)_effectiveAppearanceIsDark
{
- return _impl->useDefaultAppearance();
+ return _impl->effectiveAppearanceIsDark();
}
#endif // PLATFORM(MAC)
@@ -691,7 +691,7 @@
_impl->setAutomaticallyAdjustsContentInsets(true);
_impl->setRequiresUserActionForEditingControlsManager([configuration _requiresUserActionForEditingControlsManager]);
- _impl->setDefaultAppearance([self _defaultAppearance]);
+ _impl->setUseDarkAppearance(self._effectiveAppearanceIsDark);
#endif
#if ENABLE(ACCESSIBILITY_EVENTS)
@@ -6268,7 +6268,7 @@
- (void)_setUseSystemAppearance:(BOOL)useSystemAppearance
{
_impl->setUseSystemAppearance(useSystemAppearance);
- _impl->setDefaultAppearance([self _defaultAppearance]);
+ _impl->setUseDarkAppearance(self._effectiveAppearanceIsDark);
}
- (void)effectiveAppearanceDidChange
@@ -6278,7 +6278,7 @@
if (!_impl)
return;
- _impl->setDefaultAppearance([self _defaultAppearance]);
+ _impl->setUseDarkAppearance(self._effectiveAppearanceIsDark);
}
- (void)_setHeaderBannerHeight:(int)height
Modified: trunk/Source/WebKit/UIProcess/API/mac/WKView.mm (233551 => 233552)
--- trunk/Source/WebKit/UIProcess/API/mac/WKView.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/UIProcess/API/mac/WKView.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -1622,20 +1622,20 @@
_data->_impl->setShouldSuppressFirstResponderChanges(shouldSuppress);
}
-- (bool)_defaultAppearance
+- (bool)_effectiveAppearanceIsDark
{
- return _data->_impl->useDefaultAppearance();
+ return _data->_impl->effectiveAppearanceIsDark();
}
- (void)effectiveAppearanceDidChange
{
- _data->_impl->setDefaultAppearance([self _defaultAppearance]);
+ _data->_impl->setUseDarkAppearance(self._effectiveAppearanceIsDark);
}
- (void)_setUseSystemAppearance:(BOOL)useSystemAppearance
{
_data->_impl->setUseSystemAppearance(useSystemAppearance);
- _data->_impl->setDefaultAppearance([self _defaultAppearance]);
+ _data->_impl->setUseDarkAppearance(self._effectiveAppearanceIsDark);
}
- (BOOL)_useSystemAppearance
@@ -1643,12 +1643,6 @@
return _data->_impl->useSystemAppearance();
}
-- (void)_setDefaultAppearance:(BOOL)defaultAppearance
-{
- _data->_impl->setDefaultAppearance(defaultAppearance);
-}
-
-
@end
#endif // PLATFORM(MAC)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h (233551 => 233552)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -538,8 +538,8 @@
void setUseSystemAppearance(bool);
bool useSystemAppearance();
- void setDefaultAppearance(bool);
- bool useDefaultAppearance();
+ void setUseDarkAppearance(bool);
+ bool effectiveAppearanceIsDark();
private:
#if HAVE(TOUCH_BAR)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (233551 => 233552)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -5013,19 +5013,19 @@
return m_page->useSystemAppearance();
}
-bool WebViewImpl::useDefaultAppearance()
+bool WebViewImpl::effectiveAppearanceIsDark()
{
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
NSAppearanceName appearance = [[m_view effectiveAppearance] bestMatchFromAppearancesWithNames:@[ NSAppearanceNameAqua, NSAppearanceNameDarkAqua ]];
- return [appearance isEqualToString:NSAppearanceNameAqua];
+ return [appearance isEqualToString:NSAppearanceNameDarkAqua];
#else
- return true;
+ return false;
#endif
}
-void WebViewImpl::setDefaultAppearance(bool defaultAppearance)
+void WebViewImpl::setUseDarkAppearance(bool useDarkAppearance)
{
- m_page->setDefaultAppearance(defaultAppearance);
+ m_page->setUseDarkAppearance(useDarkAppearance);
}
} // namespace WebKit
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (233551 => 233552)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -6184,7 +6184,7 @@
#if PLATFORM(MAC)
parameters.colorSpace = m_pageClient.colorSpace();
parameters.useSystemAppearance = m_useSystemAppearance;
- parameters.defaultAppearance = m_defaultAppearance;
+ parameters.useDarkAppearance = m_useDarkAppearance;
#endif
#if PLATFORM(IOS)
parameters.screenSize = screenSize();
@@ -7308,16 +7308,16 @@
m_process->send(Messages::WebPage::SetUseSystemAppearance(useSystemAppearance), m_pageID);
}
-void WebPageProxy::setDefaultAppearance(bool defaultAppearance)
+void WebPageProxy::setUseDarkAppearance(bool useDarkAppearance)
{
if (!isValid())
return;
-
- if (defaultAppearance == m_defaultAppearance)
+
+ if (useDarkAppearance == m_useDarkAppearance)
return;
-
- m_defaultAppearance = defaultAppearance;
- m_process->send(Messages::WebPage::SetDefaultAppearance(defaultAppearance), m_pageID);
+
+ m_useDarkAppearance = useDarkAppearance;
+ m_process->send(Messages::WebPage::SetUseDarkAppearance(useDarkAppearance), m_pageID);
}
void WebPageProxy::setHeaderBannerHeightForTesting(int height)
@@ -7365,7 +7365,7 @@
void WebPageProxy::showPlaybackTargetPicker(uint64_t contextId, const WebCore::FloatRect& rect, bool hasVideo)
{
- m_pageClient.mediaSessionManager().showPlaybackTargetPicker(*this, contextId, m_pageClient.rootViewToScreen(IntRect(rect)), hasVideo, m_defaultAppearance);
+ m_pageClient.mediaSessionManager().showPlaybackTargetPicker(*this, contextId, m_pageClient.rootViewToScreen(IntRect(rect)), hasVideo, m_useDarkAppearance);
}
void WebPageProxy::playbackTargetPickerClientStateDidChange(uint64_t contextId, WebCore::MediaProducer::MediaStateFlags state)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (233551 => 233552)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -829,8 +829,8 @@
#if PLATFORM(MAC)
void setUseSystemAppearance(bool);
bool useSystemAppearance() const { return m_useSystemAppearance; }
- void setDefaultAppearance(bool);
- bool defaultAppearance() const { return m_defaultAppearance; }
+ void setUseDarkAppearance(bool);
+ bool useDarkAppearance() const { return m_useDarkAppearance; }
#endif
#if PLATFORM(COCOA)
@@ -1868,7 +1868,7 @@
#if PLATFORM(MAC)
bool m_useSystemAppearance { false };
- bool m_defaultAppearance { true };
+ bool m_useDarkAppearance { false };
#endif
#if ENABLE(APPLE_PAY)
Modified: trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm (233551 => 233552)
--- trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -568,7 +568,7 @@
if (!page)
return;
- LocalDefaultSystemAppearance localAppearance(page->useSystemAppearance(), page->defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(page->useSystemAppearance(), page->useDarkAppearance());
if ([self _isPrintingPreview]) {
[self _drawPreview:nsRect];
Modified: trunk/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp (233551 => 233552)
--- trunk/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -125,7 +125,7 @@
return nullptr;
#if PLATFORM(MAC)
- LocalDefaultSystemAppearance localAppearance(frame->page()->useSystemAppearance(), frame->page()->defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(frame->page()->useSystemAppearance(), frame->page()->useDarkAppearance());
#endif
Ref<Frame> protector(*frame);
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (233551 => 233552)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -1215,7 +1215,7 @@
{
#if PLATFORM(MAC)
auto* page = webFrame()->coreFrame()->page();
- LocalDefaultSystemAppearance localAppearance(page->useSystemAppearance(), page->defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(page->useSystemAppearance(), page->useDarkAppearance());
#endif
GraphicsContext graphicsContext(context);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (233551 => 233552)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-07-06 00:38:10 UTC (rev 233552)
@@ -511,7 +511,7 @@
setPaginationLineGridEnabled(parameters.paginationLineGridEnabled);
#if PLATFORM(MAC)
setUseSystemAppearance(parameters.useSystemAppearance);
- setDefaultAppearance(parameters.defaultAppearance);
+ setUseDarkAppearance(parameters.useDarkAppearance);
#endif
// If the page is created off-screen, its visibilityState should be prerender.
m_page->setActivityState(m_activityState);
@@ -1522,7 +1522,7 @@
void WebPage::drawRect(GraphicsContext& graphicsContext, const IntRect& rect)
{
#if PLATFORM(MAC)
- LocalDefaultSystemAppearance localAppearance(m_page->useSystemAppearance(), m_page->defaultAppearance());
+ LocalDefaultSystemAppearance localAppearance(m_page->useSystemAppearance(), m_page->useDarkAppearance());
#endif
GraphicsContextStateSaver stateSaver(graphicsContext);
@@ -4205,9 +4205,9 @@
corePage()->setUseSystemAppearance(useSystemAppearance);
}
-void WebPage::setDefaultAppearance(bool defaultAppearance)
+void WebPage::setUseDarkAppearance(bool useDarkAppearance)
{
- corePage()->setDefaultAppearance(defaultAppearance);
+ corePage()->setUseDarkAppearance(useDarkAppearance);
RenderTheme::singleton().platformColorsDidChange();
corePage()->setNeedsRecalcStyleInAllFrames();
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (233551 => 233552)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2018-07-06 00:38:10 UTC (rev 233552)
@@ -519,7 +519,7 @@
void setBottomOverhangImage(WebImage*);
void setUseSystemAppearance(bool);
- void setDefaultAppearance(bool);
+ void setUseDarkAppearance(bool);
#endif
bool windowIsFocused() const;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (233551 => 233552)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2018-07-06 00:38:10 UTC (rev 233552)
@@ -448,7 +448,7 @@
HandleAcceptedCandidate(struct WebCore::TextCheckingResult acceptedCandidate)
SetUseSystemAppearance(bool useSystemAppearance);
- SetDefaultAppearance(bool defaultAppearance);
+ SetUseDarkAppearance(bool useDarkAppearance);
SetHeaderBannerHeightForTesting(int height);
SetFooterBannerHeightForTesting(int height);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (233551 => 233552)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-07-06 00:38:10 UTC (rev 233552)
@@ -1,3 +1,19 @@
+2018-07-05 Timothy Hatcher <[email protected]>
+
+ Rename and flip the meaning of defaultAppearance to be useDarkAppearance.
+ https://bugs.webkit.org/show_bug.cgi?id=187369
+ rdar://problem/41870420
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebMediaPlaybackTargetPicker.mm:
+ (WebMediaPlaybackTargetPicker::showPlaybackTargetPicker):
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView _effectiveAppearanceIsDark]):
+ (-[WebView _updateDefaultAppearance]):
+ (-[WebView _defaultAppearance]): Deleted.
+
2018-07-04 Ryosuke Niwa <[email protected]>
Youtube video pages crash after a couple of minutes
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebMediaPlaybackTargetPicker.mm (233551 => 233552)
--- trunk/Source/WebKitLegacy/mac/WebView/WebMediaPlaybackTargetPicker.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebMediaPlaybackTargetPicker.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -53,7 +53,7 @@
void WebMediaPlaybackTargetPicker::showPlaybackTargetPicker(uint64_t contextId, const WebCore::FloatRect& rect, bool hasVideo)
{
- WebCore::WebMediaSessionManager::shared().showPlaybackTargetPicker(*this, contextId, WebCore::IntRect(rect), hasVideo, m_page ? m_page->defaultAppearance() : true);
+ WebCore::WebMediaSessionManager::shared().showPlaybackTargetPicker(*this, contextId, WebCore::IntRect(rect), hasVideo, m_page ? m_page->useDarkAppearance() : false);
}
void WebMediaPlaybackTargetPicker::playbackTargetPickerClientStateDidChange(uint64_t contextId, WebCore::MediaProducer::MediaStateFlags state)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (233551 => 233552)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-07-06 00:25:04 UTC (rev 233551)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-07-06 00:38:10 UTC (rev 233552)
@@ -1574,7 +1574,7 @@
ResourceHandle::forceContentSniffing();
_private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
- _private->page->setDefaultAppearance([self _defaultAppearance]);
+ _private->page->setUseDarkAppearance(self._effectiveAppearanceIsDark);
#endif
_private->page->settings().setContentDispositionAttachmentSandboxEnabled(true);
@@ -5275,19 +5275,19 @@
return insets;
}
-- (bool)_defaultAppearance
+- (bool)_effectiveAppearanceIsDark
{
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
NSAppearanceName appearance = [[self effectiveAppearance] bestMatchFromAppearancesWithNames:@[ NSAppearanceNameAqua, NSAppearanceNameDarkAqua ]];
- return [appearance isEqualToString:NSAppearanceNameAqua];
+ return [appearance isEqualToString:NSAppearanceNameDarkAqua];
#else
- return true;
+ return false;
#endif
}
- (void)_updateDefaultAppearance
{
- _private->page->setDefaultAppearance([self _defaultAppearance]);
+ _private->page->setUseDarkAppearance(self._effectiveAppearanceIsDark);
RenderTheme::singleton().platformColorsDidChange();
_private->page->setNeedsRecalcStyleInAllFrames();
}
