RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 14:42:44 +00:00
Code Issues Activity Actions

WindowServer: Get rid of the WSWindow lock now that accesses are serial.

Browse source
This commit is contained in:
Andreas Kling 2019-02-14 10:35:56 +01:00
parent e5df2a5d5b
commit c4703bedea
4 changed files with 17 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
WindowServer/WSMenu.cpp
View file

@ -68,7 +68,6 @@ WSWindow& WSMenu::ensure_menu_window()
} }
auto window = make<WSWindow>(*this); auto window = make<WSWindow>(*this);
WSWindowLocker locker(*window);
window->set_rect(0, 0, width(), height()); window->set_rect(0, 0, width(), height());
m_menu_window = move(window); m_menu_window = move(window);
draw(); draw();
@ -79,7 +78,6 @@ WSWindow& WSMenu::ensure_menu_window()
void WSMenu::draw() void WSMenu::draw()
{ {
ASSERT(menu_window()); ASSERT(menu_window());
WSWindowLocker locker(*menu_window());
ASSERT(menu_window()->backing()); ASSERT(menu_window()->backing());
Painter painter(*menu_window()->backing()); Painter painter(*menu_window()->backing());
@ -105,7 +103,6 @@ void WSMenu::draw()
void WSMenu::on_window_message(WSMessage& message) void WSMenu::on_window_message(WSMessage& message)
{ {
WSWindowLocker locker(*menu_window());
ASSERT(menu_window()); ASSERT(menu_window());
if (message.type() == WSMessage::MouseMove) { if (message.type() == WSMessage::MouseMove) {
auto* item = item_at(static_cast<WSMouseEvent&>(message).position()); auto* item = item_at(static_cast<WSMouseEvent&>(message).position());

43
WindowServer/WSWindow.cpp
View file

@ -5,16 +5,14 @@
#include <WindowServer/WSClientConnection.h> #include <WindowServer/WSClientConnection.h>
WSWindow::WSWindow(WSMenu& menu) WSWindow::WSWindow(WSMenu& menu)
: m_lock("WSWindow (menu)") : m_type(WSWindowType::Menu)
, m_type(WSWindowType::Menu)
, m_menu(&menu) , m_menu(&menu)
{ {
WSWindowManager::the().add_window(*this); WSWindowManager::the().add_window(*this);
} }
WSWindow::WSWindow(int client_id, int window_id) WSWindow::WSWindow(int client_id, int window_id)
: m_lock("WSWindow (normal)") : m_client_id(client_id)
, m_client_id(client_id)
, m_type(WSWindowType::Normal) , m_type(WSWindowType::Normal)
, m_window_id(window_id) , m_window_id(window_id)
{ {
@ -28,35 +26,28 @@ WSWindow::~WSWindow()
void WSWindow::set_title(String&& title) void WSWindow::set_title(String&& title)
{ {
{ if (m_title == title)
WSWindowLocker locker(*this); return;
if (m_title == title) m_title = move(title);
return;
m_title = move(title);
}
WSWindowManager::the().notify_title_changed(*this); WSWindowManager::the().notify_title_changed(*this);
} }
void WSWindow::set_rect(const Rect& rect) void WSWindow::set_rect(const Rect& rect)
{ {
Rect old_rect; Rect old_rect;
{ auto* client = WSClientConnection::from_client_id(m_client_id);
WSWindowLocker locker(*this); if (!client && !m_menu)
auto* client = WSClientConnection::from_client_id(m_client_id); return;
if (!client && !m_menu) if (m_rect == rect)
return; return;
if (m_rect == rect) old_rect = m_rect;
return; m_rect = rect;
old_rect = m_rect; if (!m_backing || old_rect.size() != rect.size()) {
m_rect = rect; if (m_menu)
if (!m_backing || old_rect.size() != rect.size()) { m_backing = GraphicsBitmap::create_kernel_only(m_rect.size());
if (m_menu) else if (client)
m_backing = GraphicsBitmap::create_kernel_only(m_rect.size()); m_backing = client->create_bitmap(m_rect.size());
else if (client)
m_backing = client->create_bitmap(m_rect.size());
}
} }
WSWindowManager::the().notify_rect_changed(*this, old_rect, rect); WSWindowManager::the().notify_rect_changed(*this, old_rect, rect);
} }

13
WindowServer/WSWindow.h
View file

@ -4,15 +4,12 @@
#include <SharedGraphics/GraphicsBitmap.h> #include <SharedGraphics/GraphicsBitmap.h>
#include <AK/AKString.h> #include <AK/AKString.h>
#include <AK/InlineLinkedList.h> #include <AK/InlineLinkedList.h>
#include <AK/Lock.h>
#include <AK/Badge.h>
#include "WSMessageReceiver.h" #include "WSMessageReceiver.h"
#include <WindowServer/WSWindowType.h> #include <WindowServer/WSWindowType.h>
class WSMenu; class WSMenu;
class WSWindow final : public WSMessageReceiver, public InlineLinkedListNode<WSWindow> { class WSWindow final : public WSMessageReceiver, public InlineLinkedListNode<WSWindow> {
friend class WSWindowLocker;
public: public:
WSWindow(int client_id, int window_id); WSWindow(int client_id, int window_id);
explicit WSWindow(WSMenu&); explicit WSWindow(WSMenu&);
@ -66,7 +63,6 @@ public:
WSWindow* m_prev { nullptr }; WSWindow* m_prev { nullptr };
private: private:
Lock m_lock;
int m_client_id { 0 }; int m_client_id { 0 };
String m_title; String m_title;
Rect m_rect; Rect m_rect;
@ -80,12 +76,3 @@ private:
RetainPtr<GraphicsBitmap> m_backing; RetainPtr<GraphicsBitmap> m_backing;
int m_window_id { -1 }; int m_window_id { -1 };
}; };
class WSWindowLocker {
public:
WSWindowLocker(WSWindow& window) : m_locker(window.m_lock) { }
~WSWindowLocker() { }
private:
Locker m_locker;
};

1
WindowServer/WSWindowManager.cpp
View file

@ -633,7 +633,6 @@ void WSWindowManager::compose()
} }
for_each_visible_window_from_back_to_front([&] (WSWindow& window) { for_each_visible_window_from_back_to_front([&] (WSWindow& window) {
WSWindowLocker locker(window);
RetainPtr<GraphicsBitmap> backing = window.backing(); RetainPtr<GraphicsBitmap> backing = window.backing();
if (!backing) if (!backing)
return IterationDecision::Continue; return IterationDecision::Continue;