mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 111.0.5563.0 (#1097615)
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "base/functional/callback.h"
|
||||
#include "base/memory/shared_memory_mapping.h"
|
||||
#include "components/viz/host/host_display_client.h"
|
||||
#include "ui/gfx/native_widget_types.h"
|
||||
|
@@ -85,6 +85,7 @@ struct PopulateAxNodeAttributes {
|
||||
case ax::mojom::IntAttribute::kScrollYMin:
|
||||
case ax::mojom::IntAttribute::kScrollYMax:
|
||||
case ax::mojom::IntAttribute::kHasPopup:
|
||||
case ax::mojom::IntAttribute::kIsPopup:
|
||||
case ax::mojom::IntAttribute::kHierarchicalLevel:
|
||||
case ax::mojom::IntAttribute::kTextSelStart:
|
||||
case ax::mojom::IntAttribute::kTextSelEnd:
|
||||
|
@@ -15,8 +15,8 @@
|
||||
#include "libcef/browser/osr/video_consumer_osr.h"
|
||||
#include "libcef/browser/thread_util.h"
|
||||
|
||||
#include "base/callback_helpers.h"
|
||||
#include "base/command_line.h"
|
||||
#include "base/functional/callback_helpers.h"
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "cc/base/switches.h"
|
||||
@@ -240,8 +240,8 @@ CefRenderWidgetHostViewOSR::CefRenderWidgetHostViewOSR(
|
||||
// Matching the attributes from RecyclableCompositorMac.
|
||||
compositor_.reset(new ui::Compositor(
|
||||
context_factory->AllocateFrameSinkId(), context_factory,
|
||||
base::ThreadTaskRunnerHandle::Get(), false /* enable_pixel_canvas */,
|
||||
use_external_begin_frame));
|
||||
base::SingleThreadTaskRunner::GetCurrentDefault(),
|
||||
false /* enable_pixel_canvas */, use_external_begin_frame));
|
||||
compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
|
||||
|
||||
compositor_->SetDelegate(this);
|
||||
@@ -635,8 +635,7 @@ void CefRenderWidgetHostViewOSR::InitAsPopup(
|
||||
Show();
|
||||
}
|
||||
|
||||
void CefRenderWidgetHostViewOSR::UpdateCursor(
|
||||
const content::WebCursor& cursor) {}
|
||||
void CefRenderWidgetHostViewOSR::UpdateCursor(const ui::Cursor& cursor) {}
|
||||
|
||||
content::CursorManager* CefRenderWidgetHostViewOSR::GetCursorManager() {
|
||||
return cursor_manager_.get();
|
||||
|
@@ -158,7 +158,7 @@ class CefRenderWidgetHostViewOSR
|
||||
void InitAsPopup(content::RenderWidgetHostView* parent_host_view,
|
||||
const gfx::Rect& bounds,
|
||||
const gfx::Rect& anchor_rect) override;
|
||||
void UpdateCursor(const content::WebCursor& cursor) override;
|
||||
void UpdateCursor(const ui::Cursor& cursor) override;
|
||||
void SetIsLoading(bool is_loading) override;
|
||||
void RenderProcessGone() override;
|
||||
void Destroy() override;
|
||||
|
@@ -32,7 +32,7 @@ SoftwareOutputDeviceProxy::SoftwareOutputDeviceProxy(
|
||||
|
||||
void SoftwareOutputDeviceProxy::OnSwapBuffers(
|
||||
SwapBuffersCallback swap_ack_callback,
|
||||
gl::FrameData data) {
|
||||
gfx::FrameData data) {
|
||||
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
|
||||
DCHECK(swap_ack_callback_.is_null());
|
||||
|
||||
|
@@ -28,7 +28,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputDeviceProxy
|
||||
|
||||
// SoftwareOutputDevice implementation.
|
||||
void OnSwapBuffers(SwapBuffersCallback swap_ack_callback,
|
||||
gl::FrameData data) override;
|
||||
gfx::FrameData data) override;
|
||||
|
||||
// SoftwareOutputDeviceBase implementation.
|
||||
void Resize(const gfx::Size& viewport_pixel_size,
|
||||
|
@@ -11,7 +11,7 @@
|
||||
#include "libcef/browser/osr/render_widget_host_view_osr.h"
|
||||
#include "libcef/browser/osr/touch_handle_drawable_osr.h"
|
||||
|
||||
#include "base/bind.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "content/browser/renderer_host/render_widget_host_delegate.h"
|
||||
#include "content/browser/renderer_host/render_widget_host_impl.h"
|
||||
#include "content/public/browser/context_menu_params.h"
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#ifndef LIBCEF_BROWSER_OSR_VIDEO_CONSUMER_OSR_H_
|
||||
#define LIBCEF_BROWSER_OSR_VIDEO_CONSUMER_OSR_H_
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "base/functional/callback.h"
|
||||
#include "components/viz/host/client_frame_sink_video_capturer.h"
|
||||
#include "media/capture/mojom/video_capture_types.mojom.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
@@ -149,6 +149,9 @@ void CefWebContentsViewOSR::SetOverscrollControllerEnabled(bool enabled) {}
|
||||
|
||||
void CefWebContentsViewOSR::OnCapturerCountChanged() {}
|
||||
|
||||
void CefWebContentsViewOSR::UpdateWindowControlsOverlay(
|
||||
const gfx::Rect& bounding_rect) {}
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
bool CefWebContentsViewOSR::CloseTabAfterEventTrackingIfNeeded() {
|
||||
return false;
|
||||
|
@@ -61,6 +61,7 @@ class CefWebContentsViewOSR : public content::WebContentsView,
|
||||
content::RenderViewHost* new_host) override;
|
||||
void SetOverscrollControllerEnabled(bool enabled) override;
|
||||
void OnCapturerCountChanged() override;
|
||||
void UpdateWindowControlsOverlay(const gfx::Rect& bounding_rect) override;
|
||||
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
bool CloseTabAfterEventTrackingIfNeeded() override;
|
||||
|
Reference in New Issue
Block a user