mirror of
https://github.com/aphrody-labs/cef.git
synced 2026-10-14 05:09:23 +00:00
Marshall Greenblatt
a26ddfd279
win: dxil.dll is no longer distributed mac: Xcode 27 (macOS 26.6+) is now required
110 lines
4.5 KiB
Diff
110 lines
4.5 KiB
Diff
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
|
|
index d215484acb2f036cfdbfaa34c9195b29dd46f46e..6d9d750b9c549027fc07f5938116180044482704 100644
|
|
--- content/browser/devtools/devtools_instrumentation.h
|
|
+++ content/browser/devtools/devtools_instrumentation.h
|
|
@@ -151,7 +151,7 @@ bool ApplyUserAgentMetadataOverrides(
|
|
FrameTreeNode* frame_tree_node,
|
|
std::optional<blink::UserAgentMetadata>* override_out);
|
|
|
|
-class WillCreateURLLoaderFactoryParams final {
|
|
+class CONTENT_EXPORT WillCreateURLLoaderFactoryParams final {
|
|
STACK_ALLOCATED();
|
|
|
|
public:
|
|
diff --git content/browser/renderer_host/input/mouse_wheel_phase_handler.h content/browser/renderer_host/input/mouse_wheel_phase_handler.h
|
|
index 0e48e79829001f718f219ed144de9c119240413f..eaca632ed4407b3fa7ce88c3a4c0c8abd75f8dfc 100644
|
|
--- content/browser/renderer_host/input/mouse_wheel_phase_handler.h
|
|
+++ content/browser/renderer_host/input/mouse_wheel_phase_handler.h
|
|
@@ -9,6 +9,7 @@
|
|
#include "base/time/time.h"
|
|
#include "base/timer/timer.h"
|
|
#include "content/browser/renderer_host/render_widget_host_delegate.h"
|
|
+#include "content/common/content_export.h"
|
|
#include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
|
|
#include "third_party/blink/public/mojom/input/input_event_result.mojom-shared.h"
|
|
|
|
diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
|
index 09d80f2ba678df9ab1b9b2b74ad66d4546036fb2..5dbff44c280a145c65146279a971620fc18db54c 100644
|
|
--- content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
|
+++ content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
|
@@ -8,6 +8,7 @@
|
|
#include "base/functional/callback_forward.h"
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "base/time/time.h"
|
|
+#include "content/common/content_export.h"
|
|
#include "content/common/input/synthetic_gesture_target.h"
|
|
#include "ui/gfx/geometry/point_f.h"
|
|
|
|
@@ -26,7 +27,8 @@ namespace content {
|
|
|
|
class RenderWidgetHostImpl;
|
|
|
|
-class SyntheticGestureTargetBase : public SyntheticGestureTarget {
|
|
+class CONTENT_EXPORT SyntheticGestureTargetBase :
|
|
+ public SyntheticGestureTarget {
|
|
public:
|
|
explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host);
|
|
|
|
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
|
|
index 0a8db62080e2e8a182467c60d1174bb40c198ec5..7c3cc3818f7b34a810247dd7a7a20185dc9cc3bf 100644
|
|
--- third_party/blink/renderer/controller/BUILD.gn
|
|
+++ third_party/blink/renderer/controller/BUILD.gn
|
|
@@ -3,6 +3,7 @@
|
|
# found in the LICENSE file.
|
|
|
|
import("//build/config/ui.gni")
|
|
+import("//cef/libcef/features/features.gni")
|
|
import("//testing/test.gni")
|
|
import("//third_party/blink/renderer/bindings/bindings.gni")
|
|
import("//third_party/blink/renderer/config.gni")
|
|
@@ -72,6 +73,15 @@ component("controller") {
|
|
"performance_manager/v8_worker_memory_reporter.h",
|
|
]
|
|
|
|
+ if (enable_cef) {
|
|
+ sources += [
|
|
+ "//cef/libcef/renderer/blink_glue.cc",
|
|
+ "//cef/libcef/renderer/blink_glue.h",
|
|
+ ]
|
|
+ configs += [ "//cef/libcef/features:config" ]
|
|
+ deps += [ "//cef/libcef/features:deps" ]
|
|
+ }
|
|
+
|
|
if (is_linux || is_chromeos) {
|
|
sources += [
|
|
"memory_usage_monitor_posix.cc",
|
|
diff --git ui/events/keycodes/BUILD.gn ui/events/keycodes/BUILD.gn
|
|
index 4f4fbfb769cf8d7a8a10c6772f39b2eef8362b53..a794da2d8343bb8aafe59dd8e60d2c3d2dfd62e3 100644
|
|
--- ui/events/keycodes/BUILD.gn
|
|
+++ ui/events/keycodes/BUILD.gn
|
|
@@ -19,6 +19,8 @@ source_set("xkb") {
|
|
"//ui/gfx/x/keysyms",
|
|
]
|
|
|
|
+ defines = [ "KEYCODES_X_IMPLEMENTATION" ]
|
|
+
|
|
deps = [
|
|
"//base",
|
|
"//ui/events:dom_keycode_converter",
|
|
diff --git ui/events/keycodes/keyboard_code_conversion_xkb.h ui/events/keycodes/keyboard_code_conversion_xkb.h
|
|
index 5693e3a1c4bc4c5b4277fd20f6aaf1290f5efe35..88c0cc6d590987f7834c53b6069ac9576a1eeb2f 100644
|
|
--- ui/events/keycodes/keyboard_code_conversion_xkb.h
|
|
+++ ui/events/keycodes/keyboard_code_conversion_xkb.h
|
|
@@ -9,6 +9,7 @@
|
|
|
|
|
|
#include "ui/events/keycodes/dom/dom_key.h"
|
|
+#include "ui/events/keycodes/keycodes_x_export.h"
|
|
#include "ui/events/keycodes/xkb_keysym.h"
|
|
|
|
namespace ui {
|
|
@@ -24,7 +25,7 @@ DomKey NonPrintableXKeySymToDomKey(xkb_keysym_t keysym);
|
|
// char16_t DeadXKeySymToCombiningCharacter(xkb_keysym_t keysym);
|
|
|
|
// Return the DomKey determined by the XKB layout result (keysym, character).
|
|
-DomKey XKeySymToDomKey(xkb_keysym_t keysym, char16_t character);
|
|
+KEYCODES_X_EXPORT DomKey XKeySymToDomKey(xkb_keysym_t keysym, char16_t character);
|
|
|
|
} // namespace ui
|
|
|