[webkit-changes] [WebKit/WebKit] 5b14c8: More minor Theme and RenderTheme cleanup

Anne van Kesteren noreply at github.com
Sat Dec 9 23:36:16 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 5b14c827a3e38d548c4635dc387049eef09133e4
      https://github.com/WebKit/WebKit/commit/5b14c827a3e38d548c4635dc387049eef09133e4
  Author: Anne van Kesteren <annevk at annevk.nl>
  Date:   2023-12-09 (Sat, 09 Dec 2023)

  Changed paths:
    M Source/WebCore/platform/Theme.cpp
    M Source/WebCore/platform/Theme.h
    M Source/WebCore/platform/mac/ThemeMac.h
    M Source/WebCore/platform/mac/ThemeMac.mm
    M Source/WebCore/rendering/RenderTheme.cpp
    M Source/WebCore/rendering/RenderTheme.h
    M Source/WebCore/rendering/RenderThemeMac.h
    M Source/WebCore/rendering/RenderThemeMac.mm

  Log Message:
  -----------
  More minor Theme and RenderTheme cleanup
https://bugs.webkit.org/show_bug.cgi?id=266148

Reviewed by Tim Horton.

Only macOS uses Theme::singleton().baselinePositionAdjustment() so
instead fold that into RenderThemeMac.

Make RenderTheme::adjustRepaintRect() more clearly macOS specific.
Although Adwaita would also run the code,
Theme::singleton().inflateControlPaintRect() is a no-op in all themes
except for macOS. A future larger refactoring could maybe fold that
into RenderThemeMac too.

And then finally inline some Theme methods for nicer git grep results.

* Source/WebCore/platform/Theme.cpp:
(WebCore::Theme::baselinePositionAdjustment const): Deleted.
(WebCore::Theme::controlRequiresPreWhiteSpace const): Deleted.
(WebCore::Theme::inflateControlPaintRect const): Deleted.
* Source/WebCore/platform/Theme.h:
(WebCore::Theme::controlRequiresPreWhiteSpace const):
(WebCore::Theme::inflateControlPaintRect const):
* Source/WebCore/platform/mac/ThemeMac.h:
* Source/WebCore/platform/mac/ThemeMac.mm:
(WebCore::ThemeMac::baselinePositionAdjustment const): Deleted.
* Source/WebCore/rendering/RenderTheme.cpp:
(WebCore::RenderTheme::baselinePosition const):
(WebCore::RenderTheme::adjustRepaintRect): Deleted.
* Source/WebCore/rendering/RenderTheme.h:
(WebCore::RenderTheme::adjustRepaintRect):
* Source/WebCore/rendering/RenderThemeMac.h:
* Source/WebCore/rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::baselinePosition const):
(WebCore::RenderThemeMac::adjustRepaintRect):

Canonical link: https://commits.webkit.org/271831@main




More information about the webkit-changes mailing list