mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
119 lines
4.6 KiB
Diff
119 lines
4.6 KiB
Diff
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
|
|
index 51da615ed2e56..fb7d3b21c759a 100644
|
|
--- content/browser/devtools/devtools_instrumentation.h
|
|
+++ content/browser/devtools/devtools_instrumentation.h
|
|
@@ -116,7 +116,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 d69f9d4641613..e88aaf8617c52 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"
|
|
|
|
@@ -51,7 +52,7 @@ enum class FirstScrollUpdateAckState {
|
|
// The MouseWheelPhaseHandler is responsible for adding the proper phase to
|
|
// wheel events. Phase information is necessary for wheel scrolling since it
|
|
// shows the start and end of a scrolling sequence.
|
|
-class MouseWheelPhaseHandler {
|
|
+class CONTENT_EXPORT MouseWheelPhaseHandler {
|
|
public:
|
|
MouseWheelPhaseHandler(RenderWidgetHostViewBase* const host_view);
|
|
|
|
diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
|
index 09d80f2ba678d..5dbff44c280a1 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 e202f66106af0..64a316dc80348 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")
|
|
@@ -69,6 +70,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 4f4fbfb769cf8..a794da2d8343b 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 5693e3a1c4bc4..88c0cc6d59098 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
|
|
|