134 lines
5.0 KiB
Diff
134 lines
5.0 KiB
Diff
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
|
|
index a8ad8c8220c8..91ca3ff02fbe 100644
|
|
--- content/browser/devtools/devtools_instrumentation.h
|
|
+++ content/browser/devtools/devtools_instrumentation.h
|
|
@@ -12,6 +12,7 @@
|
|
#include <vector>
|
|
|
|
#include "base/optional.h"
|
|
+#include "content/common/content_export.h"
|
|
#include "content/common/navigation_params.mojom.h"
|
|
#include "content/public/browser/certificate_request_result_type.h"
|
|
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
|
@@ -74,7 +75,7 @@ bool ApplyUserAgentMetadataOverrides(
|
|
FrameTreeNode* frame_tree_node,
|
|
base::Optional<blink::UserAgentMetadata>* override_out);
|
|
|
|
-bool WillCreateURLLoaderFactory(
|
|
+CONTENT_EXPORT bool WillCreateURLLoaderFactory(
|
|
RenderFrameHostImpl* rfh,
|
|
bool is_navigation,
|
|
bool is_download,
|
|
diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
|
index 4dd9b2645d60..23b46ce1a43a 100644
|
|
--- content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
|
+++ content/browser/renderer_host/input/synthetic_gesture_target_base.h
|
|
@@ -9,6 +9,7 @@
|
|
#include "base/macros.h"
|
|
#include "base/time/time.h"
|
|
#include "content/browser/renderer_host/input/synthetic_gesture_target.h"
|
|
+#include "content/common/content_export.h"
|
|
#include "ui/gfx/geometry/point_f.h"
|
|
|
|
namespace ui {
|
|
@@ -26,7 +27,8 @@ namespace content {
|
|
|
|
class RenderWidgetHostImpl;
|
|
|
|
-class SyntheticGestureTargetBase : public SyntheticGestureTarget {
|
|
+class CONTENT_EXPORT SyntheticGestureTargetBase :
|
|
+ public SyntheticGestureTarget {
|
|
public:
|
|
explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host);
|
|
~SyntheticGestureTargetBase() override;
|
|
diff --git content/common/content_switches_internal.h content/common/content_switches_internal.h
|
|
index 886bdf0edf8f..1d714000cce5 100644
|
|
--- content/common/content_switches_internal.h
|
|
+++ content/common/content_switches_internal.h
|
|
@@ -15,7 +15,7 @@ class CommandLine;
|
|
|
|
namespace content {
|
|
|
|
-bool IsPinchToZoomEnabled();
|
|
+CONTENT_EXPORT bool IsPinchToZoomEnabled();
|
|
|
|
blink::mojom::V8CacheOptions GetV8CacheOptions();
|
|
|
|
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
|
|
index 9cfeb73eb397..de5bc486f204 100644
|
|
--- third_party/blink/renderer/controller/BUILD.gn
|
|
+++ third_party/blink/renderer/controller/BUILD.gn
|
|
@@ -25,6 +25,7 @@ component("controller") {
|
|
|
|
configs += [
|
|
"//build/config/compiler:wexit_time_destructors",
|
|
+ "//cef/libcef/features:config",
|
|
"//third_party/blink/renderer:config",
|
|
"//third_party/blink/renderer:inside_blink",
|
|
"//third_party/blink/renderer:non_test_config",
|
|
@@ -45,6 +46,8 @@ component("controller") {
|
|
"memory_usage_monitor.h",
|
|
"performance_manager/renderer_resource_coordinator_impl.cc",
|
|
"performance_manager/renderer_resource_coordinator_impl.h",
|
|
+ "//cef/libcef/renderer/blink_glue.cc",
|
|
+ "//cef/libcef/renderer/blink_glue.h",
|
|
]
|
|
|
|
if (is_linux || is_chromeos) {
|
|
diff --git ui/events/keycodes/BUILD.gn ui/events/keycodes/BUILD.gn
|
|
index 12f3abf92434..d73901dece01 100644
|
|
--- ui/events/keycodes/BUILD.gn
|
|
+++ ui/events/keycodes/BUILD.gn
|
|
@@ -16,6 +16,8 @@ source_set("xkb") {
|
|
|
|
public_deps = [ "//ui/base:buildflags" ]
|
|
|
|
+ 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 a1f9b78704fb..c7d3558251d9 100644
|
|
--- ui/events/keycodes/keyboard_code_conversion_xkb.h
|
|
+++ ui/events/keycodes/keyboard_code_conversion_xkb.h
|
|
@@ -9,6 +9,7 @@
|
|
|
|
#include "base/strings/string16.h"
|
|
#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);
|
|
// base::char16 DeadXKeySymToCombiningCharacter(xkb_keysym_t keysym);
|
|
|
|
// Return the DomKey determined by the XKB layout result (keysym, character).
|
|
-DomKey XKeySymToDomKey(xkb_keysym_t keysym, base::char16 character);
|
|
+KEYCODES_X_EXPORT DomKey XKeySymToDomKey(xkb_keysym_t keysym, base::char16 character);
|
|
|
|
} // namespace ui
|
|
|
|
diff --git ui/events/keycodes/keysym_to_unicode.h ui/events/keycodes/keysym_to_unicode.h
|
|
index a7983d179832..2bbee48e57ac 100644
|
|
--- ui/events/keycodes/keysym_to_unicode.h
|
|
+++ ui/events/keycodes/keysym_to_unicode.h
|
|
@@ -5,6 +5,8 @@
|
|
#ifndef UI_EVENTS_KEYCODES_KEYSYM_TO_UNICODE_H_
|
|
#define UI_EVENTS_KEYCODES_KEYSYM_TO_UNICODE_H_
|
|
|
|
+#include "ui/events/keycodes/keycodes_x_export.h"
|
|
+
|
|
#include <stdint.h>
|
|
|
|
namespace ui {
|
|
@@ -13,7 +15,7 @@ namespace ui {
|
|
// |keysym| doesn't represent a printable character, returns zero. We don't
|
|
// support characters outside the Basic Plane, and this function returns zero
|
|
// in that case.
|
|
-uint16_t GetUnicodeCharacterFromXKeySym(unsigned long keysym);
|
|
+KEYCODES_X_EXPORT uint16_t GetUnicodeCharacterFromXKeySym(unsigned long keysym);
|
|
|
|
} // namespace ui
|
|
|