2017-07-06 22:39:37 +02:00
|
|
|
diff --git content/app/content_service_manager_main_delegate.h content/app/content_service_manager_main_delegate.h
|
2018-07-13 21:29:20 +02:00
|
|
|
index 6f32f97e3f92..66da6d5cec53 100644
|
2017-07-06 22:39:37 +02:00
|
|
|
--- content/app/content_service_manager_main_delegate.h
|
|
|
|
+++ content/app/content_service_manager_main_delegate.h
|
2018-06-01 21:16:26 +02:00
|
|
|
@@ -18,7 +18,8 @@ namespace content {
|
2017-07-06 22:39:37 +02:00
|
|
|
|
2018-06-01 21:16:26 +02:00
|
|
|
class ContentMainRunnerImpl;
|
2017-07-06 22:39:37 +02:00
|
|
|
|
|
|
|
-class ContentServiceManagerMainDelegate : public service_manager::MainDelegate {
|
|
|
|
+class CONTENT_EXPORT ContentServiceManagerMainDelegate :
|
|
|
|
+ public service_manager::MainDelegate {
|
|
|
|
public:
|
|
|
|
explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
|
|
|
|
~ContentServiceManagerMainDelegate() override;
|
2018-06-16 00:19:14 +02:00
|
|
|
diff --git content/browser/renderer_host/input/mouse_wheel_phase_handler.h content/browser/renderer_host/input/mouse_wheel_phase_handler.h
|
|
|
|
index 305095fc420e..f5ca4eda4a66 100644
|
|
|
|
--- content/browser/renderer_host/input/mouse_wheel_phase_handler.h
|
|
|
|
+++ content/browser/renderer_host/input/mouse_wheel_phase_handler.h
|
|
|
|
@@ -7,6 +7,7 @@
|
|
|
|
|
|
|
|
#include "base/timer/timer.h"
|
|
|
|
#include "content/browser/renderer_host/render_widget_host_delegate.h"
|
|
|
|
+#include "content/common/content_export.h"
|
|
|
|
#include "content/public/common/input_event_ack_state.h"
|
|
|
|
#include "third_party/blink/public/platform/web_mouse_wheel_event.h"
|
|
|
|
|
|
|
|
@@ -55,7 +56,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);
|
|
|
|
~MouseWheelPhaseHandler() {}
|
2018-04-19 17:44:42 +02:00
|
|
|
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
|
2018-06-01 21:16:26 +02:00
|
|
|
index 20d1994e156e..45102558569f 100644
|
2018-04-19 17:44:42 +02:00
|
|
|
--- third_party/blink/renderer/controller/BUILD.gn
|
|
|
|
+++ third_party/blink/renderer/controller/BUILD.gn
|
2017-12-27 19:20:12 +01:00
|
|
|
@@ -25,6 +25,7 @@ component("controller") {
|
2017-07-06 22:39:37 +02:00
|
|
|
|
2017-12-27 19:20:12 +01:00
|
|
|
configs += [
|
|
|
|
"//build/config/compiler:wexit_time_destructors",
|
|
|
|
+ "//cef/libcef/features:config",
|
2018-04-19 17:44:42 +02:00
|
|
|
"//third_party/blink/renderer:config",
|
|
|
|
"//third_party/blink/renderer:inside_blink",
|
|
|
|
"//third_party/blink/renderer:non_test_config",
|
2018-06-01 21:16:26 +02:00
|
|
|
@@ -43,6 +44,8 @@ component("controller") {
|
|
|
|
"controller_export.h",
|
|
|
|
"dev_tools_frontend_impl.cc",
|
2018-04-19 17:44:42 +02:00
|
|
|
"dev_tools_frontend_impl.h",
|
|
|
|
+ "//cef/libcef/renderer/blink_glue.cc",
|
|
|
|
+ "//cef/libcef/renderer/blink_glue.h",
|
2017-12-27 19:20:12 +01:00
|
|
|
]
|
|
|
|
|
2018-06-01 21:16:26 +02:00
|
|
|
if (is_android) {
|