diff --git a/Libraries/LibWeb/Page/InputEvent.cpp b/Libraries/LibWeb/Page/InputEvent.cpp index 4a9baf8d6ad..5eed2744223 100644 --- a/Libraries/LibWeb/Page/InputEvent.cpp +++ b/Libraries/LibWeb/Page/InputEvent.cpp @@ -10,17 +10,17 @@ namespace Web { -KeyEvent KeyEvent::clone_without_chrome_data() const +KeyEvent KeyEvent::clone_without_browser_data() const { return { type, key, modifiers, code_point, repeat, nullptr }; } -MouseEvent MouseEvent::clone_without_chrome_data() const +MouseEvent MouseEvent::clone_without_browser_data() const { return { type, position, screen_position, button, buttons, modifiers, wheel_delta_x, wheel_delta_y, nullptr }; } -DragEvent DragEvent::clone_without_chrome_data() const +DragEvent DragEvent::clone_without_browser_data() const { return { type, position, screen_position, button, buttons, modifiers, {}, nullptr }; } diff --git a/Libraries/LibWeb/Page/InputEvent.h b/Libraries/LibWeb/Page/InputEvent.h index ab6dbe0015d..d8902196b76 100644 --- a/Libraries/LibWeb/Page/InputEvent.h +++ b/Libraries/LibWeb/Page/InputEvent.h @@ -18,8 +18,8 @@ namespace Web { -struct ChromeInputData { - virtual ~ChromeInputData() = default; +struct BrowserInputData { + virtual ~BrowserInputData() = default; }; struct KeyEvent { @@ -28,7 +28,7 @@ struct KeyEvent { KeyUp, }; - KeyEvent clone_without_chrome_data() const; + KeyEvent clone_without_browser_data() const; Type type; UIEvents::KeyCode key { UIEvents::KeyCode::Key_Invalid }; @@ -36,7 +36,7 @@ struct KeyEvent { u32 code_point { 0 }; bool repeat { false }; - OwnPtr chrome_data; + OwnPtr browser_data; }; struct MouseEvent { @@ -48,7 +48,7 @@ struct MouseEvent { DoubleClick, }; - MouseEvent clone_without_chrome_data() const; + MouseEvent clone_without_browser_data() const; Type type; Web::DevicePixelPoint position; @@ -59,7 +59,7 @@ struct MouseEvent { int wheel_delta_x { 0 }; int wheel_delta_y { 0 }; - OwnPtr chrome_data; + OwnPtr browser_data; }; struct DragEvent { @@ -70,7 +70,7 @@ struct DragEvent { Drop, }; - DragEvent clone_without_chrome_data() const; + DragEvent clone_without_browser_data() const; Type type; Web::DevicePixelPoint position; @@ -80,7 +80,7 @@ struct DragEvent { UIEvents::KeyModifier modifiers { UIEvents::KeyModifier::Mod_None }; Vector files; - OwnPtr chrome_data; + OwnPtr browser_data; }; using InputEvent = Variant; diff --git a/Libraries/LibWebView/ViewImplementation.cpp b/Libraries/LibWebView/ViewImplementation.cpp index 0d5be3c5086..41113bef978 100644 --- a/Libraries/LibWebView/ViewImplementation.cpp +++ b/Libraries/LibWebView/ViewImplementation.cpp @@ -203,13 +203,13 @@ void ViewImplementation::enqueue_input_event(Web::InputEvent event) m_pending_input_events.tail().visit( [this](Web::KeyEvent const& event) { - client().async_key_event(m_client_state.page_index, event.clone_without_chrome_data()); + client().async_key_event(m_client_state.page_index, event.clone_without_browser_data()); }, [this](Web::MouseEvent const& event) { - client().async_mouse_event(m_client_state.page_index, event.clone_without_chrome_data()); + client().async_mouse_event(m_client_state.page_index, event.clone_without_browser_data()); }, [this](Web::DragEvent& event) { - auto cloned_event = event.clone_without_chrome_data(); + auto cloned_event = event.clone_without_browser_data(); cloned_event.files = move(event.files); client().async_drag_event(m_client_state.page_index, cloned_event); diff --git a/UI/AppKit/Interface/Event.mm b/UI/AppKit/Interface/Event.mm index ce627469801..92d2b0769f5 100644 --- a/UI/AppKit/Interface/Event.mm +++ b/UI/AppKit/Interface/Event.mm @@ -75,7 +75,7 @@ Web::MouseEvent ns_event_to_mouse_event(Web::MouseEvent::Type type, NSEvent* eve return { type, device_position, device_screen_position, button, button, modifiers, wheel_delta_x, wheel_delta_y, nullptr }; } -struct DragData : public Web::ChromeInputData { +struct DragData : public Web::BrowserInputData { explicit DragData(Vector urls) : urls(move(urls)) { @@ -96,7 +96,7 @@ Web::DragEvent ns_event_to_drag_event(Web::DragEvent::Type type, id files; - OwnPtr chrome_data; + OwnPtr browser_data; auto for_each_file = [&](auto callback) { NSArray* file_list = [[event draggingPasteboard] readObjectsForClasses:@[ [NSURL class] ] @@ -123,16 +123,16 @@ Web::DragEvent ns_event_to_drag_event(Web::DragEvent::Type type, id(move(urls)); + browser_data = make(move(urls)); } - return { type, device_position, device_screen_position, button, button, modifiers, move(files), move(chrome_data) }; + return { type, device_position, device_screen_position, button, button, modifiers, move(files), move(browser_data) }; } Vector drag_event_url_list(Web::DragEvent const& event) { - auto& chrome_data = as(*event.chrome_data); - return move(chrome_data.urls); + auto& browser_data = as(*event.browser_data); + return move(browser_data.urls); } NSEvent* create_context_menu_mouse_event(NSView* view, Gfx::IntPoint position) @@ -269,7 +269,7 @@ static Web::UIEvents::KeyCode ns_key_code_to_key_code(unsigned short key_code, W return Web::UIEvents::KeyCode::Key_Invalid; } -class KeyData : public Web::ChromeInputData { +class KeyData : public Web::BrowserInputData { public: explicit KeyData(NSEvent* event) : m_event(CFBridgingRetain(event)) @@ -322,8 +322,8 @@ Web::KeyEvent ns_event_to_key_event(Web::KeyEvent::Type type, NSEvent* event) NSEvent* key_event_to_ns_event(Web::KeyEvent const& event) { - auto& chrome_data = as(*event.chrome_data); - return chrome_data.take_event(); + auto& browser_data = as(*event.browser_data); + return browser_data.take_event(); } } diff --git a/UI/Qt/WebContentView.cpp b/UI/Qt/WebContentView.cpp index b1b71898b91..d985a485dd9 100644 --- a/UI/Qt/WebContentView.cpp +++ b/UI/Qt/WebContentView.cpp @@ -801,7 +801,7 @@ void WebContentView::enqueue_native_event(Web::MouseEvent::Type type, QSinglePoi enqueue_input_event(Web::MouseEvent { type, position, screen_position.to_type(), button, buttons, modifiers, wheel_delta_x, wheel_delta_y, nullptr }); } -struct DragData : Web::ChromeInputData { +struct DragData : Web::BrowserInputData { explicit DragData(QDropEvent const& event) : urls(event.mimeData()->urls()) { @@ -822,7 +822,7 @@ void WebContentView::enqueue_native_event(Web::DragEvent::Type type, QDropEvent auto modifiers = get_modifiers_from_qt_keyboard_modifiers(event.modifiers()); Vector files; - OwnPtr chrome_data; + OwnPtr browser_data; if (type == Web::DragEvent::Type::DragStart) { VERIFY(event.mimeData()->hasUrls()); @@ -836,10 +836,10 @@ void WebContentView::enqueue_native_event(Web::DragEvent::Type type, QDropEvent files.append(file.release_value()); } } else if (type == Web::DragEvent::Type::Drop) { - chrome_data = make(event); + browser_data = make(event); } - enqueue_input_event(Web::DragEvent { type, position, screen_position.to_type(), button, buttons, modifiers, AK::move(files), AK::move(chrome_data) }); + enqueue_input_event(Web::DragEvent { type, position, screen_position.to_type(), button, buttons, modifiers, AK::move(files), AK::move(browser_data) }); } void WebContentView::finish_handling_drag_event(Web::DragEvent const& event) @@ -847,11 +847,11 @@ void WebContentView::finish_handling_drag_event(Web::DragEvent const& event) if (event.type != Web::DragEvent::Type::Drop) return; - auto const& chrome_data = as(*event.chrome_data); - emit urls_dropped(chrome_data.urls); + auto const& browser_data = as(*event.browser_data); + emit urls_dropped(browser_data.urls); } -struct KeyData : Web::ChromeInputData { +struct KeyData : Web::BrowserInputData { explicit KeyData(QKeyEvent const& event) : event(adopt_own(*event.clone())) { @@ -887,8 +887,8 @@ void WebContentView::enqueue_native_event(Web::KeyEvent::Type type, QKeyEvent co void WebContentView::finish_handling_key_event(Web::KeyEvent const& key_event) { - auto& chrome_data = as(*key_event.chrome_data); - auto& event = *chrome_data.event; + auto& browser_data = as(*key_event.browser_data); + auto& event = *browser_data.event; switch (key_event.type) { case Web::KeyEvent::Type::KeyDown: