RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 20:57:35 +00:00
Code Issues Activity Actions

Userland: static vs non-static constexpr variables

Browse source 
Problem:
- `static` variables consume memory and sometimes are less
  optimizable.
- `static const` variables can be `constexpr`, usually.
- `static` function-local variables require an initialization check
  every time the function is run.

Solution:
- If a global `static` variable is only used in a single function then
  move it into the function and make it non-`static` and `constexpr`.
- Make all global `static` variables `constexpr` instead of `const`.
- Change function-local `static const[expr]` variables to be just
  `constexpr`.
This commit is contained in:
Lenny Maiorani 2021-05-19 09:32:07 -06:00 • committed by Linus Groh
parent 17ff895e1c
commit 800ea8ea96
38 changed files with 192 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/WindowServer/Compositor.cpp
View file

@ -634,7 +634,7 @@ void Compositor::flip_buffers()
void Compositor::run_animations(Gfx::DisjointRectSet& flush_rects)
{
static const int minimize_animation_steps = 10;
constexpr int minimize_animation_steps = 10;
auto& painter = *m_back_painter;
Gfx::PainterStateSaver saver(painter);
painter.set_draw_op(Gfx::Painter::DrawOp::Invert);

16
Userland/Services/WindowServer/Menu.cpp
View file

@ -55,7 +55,7 @@ const Gfx::Font& Menu::font() const
return Gfx::FontDatabase::default_font();
}
static const char* s_checked_bitmap_data = {
static constexpr char s_checked_bitmap_data[] = {
" "
" # "
" ## "
@ -67,7 +67,7 @@ static const char* s_checked_bitmap_data = {
" "
};
static const char* s_submenu_arrow_bitmap_data = {
static constexpr char s_submenu_arrow_bitmap_data[] = {
" "
" # "
" ## "
@ -80,12 +80,12 @@ static const char* s_submenu_arrow_bitmap_data = {
};
static Gfx::CharacterBitmap* s_checked_bitmap;
static const int s_checked_bitmap_width = 9;
static const int s_checked_bitmap_height = 9;
static const int s_submenu_arrow_bitmap_width = 9;
static const int s_submenu_arrow_bitmap_height = 9;
static const int s_item_icon_width = 16;
static const int s_stripe_width = 24;
static constexpr int s_checked_bitmap_width = 9;
static constexpr int s_checked_bitmap_height = 9;
static constexpr int s_submenu_arrow_bitmap_width = 9;
static constexpr int s_submenu_arrow_bitmap_height = 9;
static constexpr int s_item_icon_width = 16;
static constexpr int s_stripe_width = 24;
int Menu::content_width() const
{

2
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -59,7 +59,7 @@ WindowManager::~WindowManager()
NonnullRefPtr<Cursor> WindowManager::get_cursor(const String& name)
{
static const auto s_default_cursor_path = "/res/cursors/arrow.x2y2.png";
constexpr auto s_default_cursor_path = "/res/cursors/arrow.x2y2.png";
auto path = m_config->read_entry("Cursor", name, s_default_cursor_path);
auto gb = Gfx::Bitmap::load_from_file(path, compositor_icon_scale());
if (gb)