diff --git a/Libraries/LibGfx/ImageFormats/WebPWriterLossless.cpp b/Libraries/LibGfx/ImageFormats/WebPWriterLossless.cpp index 617f181d185..b74bf00e117 100644 --- a/Libraries/LibGfx/ImageFormats/WebPWriterLossless.cpp +++ b/Libraries/LibGfx/ImageFormats/WebPWriterLossless.cpp @@ -333,7 +333,7 @@ static ARGB32 sub_argb32(ARGB32 a, ARGB32 b) .value(); } -static ErrorOr> maybe_write_color_indexing_transform(LittleEndianOutputBitStream& bit_stream, NonnullRefPtr bitmap, IsOpaque& is_fully_opaque) +static ErrorOr> maybe_write_color_indexing_transform(LittleEndianOutputBitStream& bit_stream, NonnullRefPtr bitmap, IsOpaque& is_fully_opaque) { // https://developers.google.com/speed/webp/docs/webp_lossless_bitstream_specification#44_color_indexing_transform unsigned color_table_size = 0; @@ -427,7 +427,7 @@ static ErrorOr> maybe_write_color_indexing_transform(Littl return new_bitmap; } -static ErrorOr write_VP8L_image_data(Stream& stream, NonnullRefPtr bitmap, VP8LEncoderOptions const& options, IsOpaque& is_fully_opaque) +static ErrorOr write_VP8L_image_data(Stream& stream, NonnullRefPtr bitmap, VP8LEncoderOptions const& options, IsOpaque& is_fully_opaque) { LittleEndianOutputBitStream bit_stream { MaybeOwned(stream) }; diff --git a/Libraries/LibWebView/ViewImplementation.h b/Libraries/LibWebView/ViewImplementation.h index d43bc370c47..4ab2468fcd3 100644 --- a/Libraries/LibWebView/ViewImplementation.h +++ b/Libraries/LibWebView/ViewImplementation.h @@ -267,7 +267,7 @@ protected: struct SharedBitmap { i32 id { -1 }; Web::DevicePixelSize last_painted_size; - RefPtr bitmap; + RefPtr bitmap; }; struct ClientState { @@ -289,7 +289,7 @@ protected: RefPtr m_backing_store_shrink_timer; - RefPtr m_backup_bitmap; + RefPtr m_backup_bitmap; Web::DevicePixelSize m_backup_bitmap_size; size_t m_crash_count = 0; diff --git a/UI/AppKit/Interface/LadybirdWebViewBridge.cpp b/UI/AppKit/Interface/LadybirdWebViewBridge.cpp index ddf2e00041a..67bb7887c12 100644 --- a/UI/AppKit/Interface/LadybirdWebViewBridge.cpp +++ b/UI/AppKit/Interface/LadybirdWebViewBridge.cpp @@ -95,7 +95,7 @@ void WebViewBridge::enqueue_input_event(Web::KeyEvent event) Optional WebViewBridge::paintable() { - Gfx::Bitmap* bitmap = nullptr; + Gfx::Bitmap const* bitmap = nullptr; Gfx::IntSize bitmap_size; if (m_client_state.has_usable_bitmap) { diff --git a/UI/AppKit/Interface/LadybirdWebViewBridge.h b/UI/AppKit/Interface/LadybirdWebViewBridge.h index 0e243c454e3..64a7a287506 100644 --- a/UI/AppKit/Interface/LadybirdWebViewBridge.h +++ b/UI/AppKit/Interface/LadybirdWebViewBridge.h @@ -42,7 +42,7 @@ public: void enqueue_input_event(Web::KeyEvent); struct Paintable { - Gfx::Bitmap& bitmap; + Gfx::Bitmap const& bitmap; Gfx::IntSize bitmap_size; }; Optional paintable(); diff --git a/UI/Headless/HeadlessWebView.cpp b/UI/Headless/HeadlessWebView.cpp index e02c9deffc5..bd4dcc4d95b 100644 --- a/UI/Headless/HeadlessWebView.cpp +++ b/UI/Headless/HeadlessWebView.cpp @@ -164,11 +164,11 @@ void HeadlessWebView::clear_content_filters() client().async_set_content_filters(m_client_state.page_index, {}); } -NonnullRefPtr>> HeadlessWebView::take_screenshot() +NonnullRefPtr>> HeadlessWebView::take_screenshot() { VERIFY(!m_pending_screenshot); - m_pending_screenshot = Core::Promise>::construct(); + m_pending_screenshot = Core::Promise>::construct(); client().async_take_document_screenshot(0); return *m_pending_screenshot; diff --git a/UI/Headless/HeadlessWebView.h b/UI/Headless/HeadlessWebView.h index 32eeb788b19..4a8127de901 100644 --- a/UI/Headless/HeadlessWebView.h +++ b/UI/Headless/HeadlessWebView.h @@ -25,7 +25,7 @@ public: void clear_content_filters(); - NonnullRefPtr>> take_screenshot(); + NonnullRefPtr>> take_screenshot(); TestPromise& test_promise() { return *m_test_promise; } void on_test_complete(TestCompletion); @@ -45,7 +45,7 @@ private: Core::AnonymousBuffer m_theme; Web::DevicePixelSize m_viewport_size; - RefPtr>> m_pending_screenshot; + RefPtr>> m_pending_screenshot; NonnullRefPtr m_test_promise; diff --git a/UI/Headless/Test.cpp b/UI/Headless/Test.cpp index b887a688f19..446071c4fc1 100644 --- a/UI/Headless/Test.cpp +++ b/UI/Headless/Test.cpp @@ -328,7 +328,7 @@ static void run_ref_test(HeadlessWebView& view, Test& test, URL::URL const& url, if (Application::the().dump_failed_ref_tests) { warnln("\033[33;1mRef test {} failed; dumping screenshots\033[0m", test.relative_path); - auto dump_screenshot = [&](Gfx::Bitmap& bitmap, StringView path) -> ErrorOr { + auto dump_screenshot = [&](Gfx::Bitmap const& bitmap, StringView path) -> ErrorOr { auto screenshot_file = TRY(Core::File::open(path, Core::File::OpenMode::Write)); auto encoded_data = TRY(Gfx::PNGWriter::encode(bitmap)); TRY(screenshot_file->write_until_depleted(encoded_data)); @@ -375,13 +375,13 @@ static void run_ref_test(HeadlessWebView& view, Test& test, URL::URL const& url, } else { test.ref_test_expectation_type = RefTestExpectationType::Match; } - view.take_screenshot()->when_resolved([&view, &test, on_test_complete = move(on_test_complete)](RefPtr screenshot) { + view.take_screenshot()->when_resolved([&view, &test, on_test_complete = move(on_test_complete)](RefPtr screenshot) { test.expectation_screenshot = move(screenshot); view.reset_zoom(); on_test_complete(); }); } else { - view.take_screenshot()->when_resolved([&view, &test](RefPtr screenshot) { + view.take_screenshot()->when_resolved([&view, &test](RefPtr screenshot) { test.actual_screenshot = move(screenshot); view.reset_zoom(); view.debug_request("load-reference-page"); diff --git a/UI/Headless/Test.h b/UI/Headless/Test.h index 277c8eb1af8..3aaeaf1fbf6 100644 --- a/UI/Headless/Test.h +++ b/UI/Headless/Test.h @@ -77,8 +77,8 @@ struct Test { Optional ref_test_expectation_type {}; - RefPtr actual_screenshot {}; - RefPtr expectation_screenshot {}; + RefPtr actual_screenshot {}; + RefPtr expectation_screenshot {}; }; struct TestCompletion {