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

LibGUI: Optimize GUI::Variant move constructor

Browse source
This commit is contained in:
Sahan Fernando 2020-12-03 22:44:00 +11:00 • committed by Andreas Kling
parent d0812e9019
commit 4062add8ed
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Libraries/LibGUI/Variant.cpp
View file

@ -26,6 +26,7 @@
#include <AK/FlyString.h> #include <AK/FlyString.h>
#include <AK/JsonValue.h> #include <AK/JsonValue.h>
#include <AK/RefPtr.h>
#include <LibGUI/Variant.h> #include <LibGUI/Variant.h>
namespace GUI { namespace GUI {
@ -255,10 +256,8 @@ Variant& Variant::operator=(Variant&& other)
{ {
if (&other == this) if (&other == this)
return *this; return *this;
// FIXME: Move, not copy!
clear(); clear();
copy_from(other); move_from(AK::move(other));
other.clear();
return *this; return *this;
} }
@ -267,6 +266,14 @@ Variant::Variant(const Variant& other)
copy_from(other); copy_from(other);
} }
void Variant::move_from(Variant&& other)
{
m_type = other.m_type;
m_value = other.m_value;
other.m_type = Type::Invalid;
other.m_value.as_string = nullptr;
}
void Variant::copy_from(const Variant& other) void Variant::copy_from(const Variant& other)
{ {
ASSERT(!is_valid()); ASSERT(!is_valid());

1
Libraries/LibGUI/Variant.h
View file

@ -250,6 +250,7 @@ public:
private: private:
void copy_from(const Variant&); void copy_from(const Variant&);
void move_from(Variant&&);
struct RawPoint { struct RawPoint {
int x; int x;