Remove EWK_BRINGUPS for M120 #2

This commit removes some EWK_BRINGUPs added during M120 upversion.

Change-Id: I9501206e5755a3b589c6ea59f82ad110d24dc3de
Signed-off-by: v-saha <v.saha@samsung.com>

diff --git a/components/viz/service/display/surface_aggregator.cc b/components/viz/service/display/surface_aggregator.cc
index 61c78e4..d6010d6 100644 (file)
--- a/components/viz/service/display/surface_aggregator.cc
+++ b/components/viz/service/display/surface_aggregator.cc
@@ -2259,11 +2259,7 @@ AggregatedFrame SurfaceAggregator::Aggregate(
   root_surface_id_ = surface_id;
 
   // Start recording new stats for this aggregation.
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   stats_.emplace();
-#else
-  stats_.emplace(AggregateStatistics());
-#endif
 
   base::ElapsedTimer prewalk_timer;
   ResolvedFrameData* resolved_frame = GetResolvedFrame(surface_id);

diff --git a/components/viz/service/display/surface_aggregator.h b/components/viz/service/display/surface_aggregator.h
index 6f1fa64..b70145c 100644 (file)
--- a/components/viz/service/display/surface_aggregator.h
+++ b/components/viz/service/display/surface_aggregator.h
@@ -132,6 +132,9 @@ class VIZ_SERVICE_EXPORT SurfaceAggregator : public SurfaceObserver {
     base::TimeDelta prewalk_time;
     base::TimeDelta copy_time;
     base::TimeDelta declare_resources_time;
+#if BUILDFLAG(IS_TIZEN)
+    AggregateStatistics() {}
+#endif
   };
 
   // SurfaceObserver implementation.

diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 0c56ecf..91f83ec 100644 (file)
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -115,18 +115,7 @@ target(link_target_type, "child") {
     "//v8",
   ]
 
-  if (is_tizen) {
-    sources += [
-      "child_process_sandbox_support_impl_linux.cc",
-      "child_process_sandbox_support_impl_linux.h",
-    ]
-    deps += [
-      "//components/services/font/public/cpp",
-      "//components/services/font/public/mojom",
-    ]
-  }
-
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "child_process_sandbox_support_impl_linux.cc",
       "child_process_sandbox_support_impl_linux.h",

diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 5cdc79a..bfb0a24 100644 (file)
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -328,8 +328,7 @@ int GpuMain(MainFunctionParams parameters) {
   // before it.
   InitializeSkia();
 
-#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
-    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   // Thread type delegate of the process should be registered before
   // first thread type change in ChildProcess constructor.
   // It also needs to be registered before the process has multiple threads,

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index c218487..a77485d 100644 (file)
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -602,8 +602,7 @@ void RenderThreadImpl::Init() {
   }
 #endif
 
-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
-    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
 #endif
 
@@ -650,8 +649,7 @@ void RenderThreadImpl::Init() {
   base::DiscardableMemoryAllocator::SetInstance(
       discardable_memory_allocator_.get());
 
-#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
-    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   // The SandboxedProcessThreadTypeHandler isn't created in
   // render_thread_impl_browsertest.cc, nor in --single-process mode.
   if (SandboxedProcessThreadTypeHandler* sandboxed_process_thread_type_handler =

diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index e6598a9..07fc80b 100644 (file)
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -244,8 +244,7 @@ std::string RendererBlinkPlatformImpl::GetNameForHistogram(const char* name) {
                             : std::string{name};
 }
 
-#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
-    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
 void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id,
                                               base::ThreadType thread_type) {
   // TODO: both of the usages of this method could just be switched to use

diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index 12bc92b..4c66ac5 100644 (file)
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -163,8 +163,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
       const blink::WebURL& document_url) override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override;
-#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
-    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   void SetThreadType(base::PlatformThreadId thread_id,
                      base::ThreadType) override;
 #endif

diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 09bfd9e..9ba4905 100644 (file)
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -265,8 +265,7 @@ int RendererMain(MainFunctionParams parameters) {
     }
 #endif
 
-#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
-    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
     // Thread type delegate of the process should be registered before
     // first thread type change in ChildProcess constructor.
     // It also needs to be registered before the process has multiple threads,

diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc
index d934805..7f9e001 100644 (file)
--- a/content/utility/utility_main.cc
+++ b/content/utility/utility_main.cc
@@ -252,8 +252,7 @@ int UtilityMain(MainFunctionParams parameters) {
     }
   }
 
-#if (BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)) || \
-    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   // Thread type delegate of the process should be registered before
   // first thread type change in ChildProcess constructor.
   // It also needs to be registered before the process has multiple threads,

diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
index e025d54..b707315 100644 (file)
--- a/content/utility/utility_thread_impl.cc
+++ b/content/utility/utility_thread_impl.cc
@@ -252,8 +252,7 @@ void UtilityThreadImpl::Init() {
 
   GetContentClient()->utility()->UtilityThreadStarted();
 
-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)) || \
-    BUILDFLAG(IS_CHROMEOS)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
   SandboxedProcessThreadTypeHandler::NotifyMainChildThreadCreated();
 #endif
 

diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn
index 77bb5bf..5c2606f 100644 (file)
--- a/media/capture/BUILD.gn
+++ b/media/capture/BUILD.gn
@@ -286,7 +286,7 @@ component("capture_lib") {
     deps += [ "//gpu/command_buffer/client" ]
   }
 
-  if (is_linux) {
+  if (is_linux || is_tizen) {
     sources += [
       "video/linux/v4l2_capture_delegate_gpu_helper.cc",
       "video/linux/v4l2_capture_delegate_gpu_helper.h",
@@ -296,7 +296,7 @@ component("capture_lib") {
   }
 
   # Establish GPU Channel
-  if (is_linux || is_win) {
+  if (is_linux || is_win || is_tizen) {
     sources += [
       "video/video_capture_gpu_channel_host.cc",
       "video/video_capture_gpu_channel_host.h",

diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
index 3517950..0d377a1 100644 (file)
--- a/media/capture/video/linux/v4l2_capture_delegate.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate.cc
@@ -1219,7 +1219,7 @@ void V4L2CaptureDelegate::SetErrorState(VideoCaptureError error,
   client_->OnError(error, from_here, reason);
 }
 
-#if BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_TIZEN)
 gfx::ColorSpace V4L2CaptureDelegate::BuildColorSpaceFromv4l2() {
   v4l2_colorspace v4l2_primary = (v4l2_colorspace)video_fmt_.fmt.pix.colorspace;
   v4l2_quantization v4l2_range =

diff --git a/media/capture/video/video_capture_buffer_tracker_factory_impl.cc b/media/capture/video/video_capture_buffer_tracker_factory_impl.cc
index a19d54a..a6c9565 100644 (file)
--- a/media/capture/video/video_capture_buffer_tracker_factory_impl.cc
+++ b/media/capture/video/video_capture_buffer_tracker_factory_impl.cc
@@ -42,7 +42,7 @@ VideoCaptureBufferTrackerFactoryImpl::CreateTracker(
       return std::make_unique<GpuMemoryBufferTrackerCros>();
 #elif BUILDFLAG(IS_APPLE)
       return std::make_unique<GpuMemoryBufferTrackerApple>();
-#elif BUILDFLAG(IS_LINUX) && !defined(EWK_BRINGUP)  // FIXME: m120 bringup
+#elif BUILDFLAG(IS_LINUX)
       return std::make_unique<V4L2GpuMemoryBufferTracker>();
 #elif BUILDFLAG(IS_WIN)
       if (!dxgi_device_manager_) {

diff --git a/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc b/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
index 56dc225..e0ca997 100644 (file)
--- a/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
+++ b/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.cc
@@ -101,11 +101,7 @@ void MediaControlTimelineElement::UpdateAria() {
 void MediaControlTimelineElement::SetPosition(double current_time,
                                               bool suppress_aria) {
   if (is_live_ && !live_anchor_time_ && current_time != 0) {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
     live_anchor_time_.emplace();
-#else
-    live_anchor_time_.emplace(LiveAnchorTime());
-#endif
     live_anchor_time_->clock_time_ = base::TimeTicks::Now();
     live_anchor_time_->media_time_ = MediaElement().currentTime();
   }

diff --git a/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.h b/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.h
index 194e4e0..eefbb5d 100644 (file)
--- a/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.h
+++ b/third_party/blink/renderer/modules/media_controls/elements/media_control_timeline_element.h
@@ -51,6 +51,9 @@ class MediaControlTimelineElement : public MediaControlSliderElement {
   struct LiveAnchorTime {
     base::TimeTicks clock_time_;
     double media_time_ = 0;
+#if BUILDFLAG(IS_TIZEN)
+    LiveAnchorTime() {}
+#endif
   };
 
   void DefaultEventHandler(Event&) override;

diff --git a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
index ac00c8f..c30b450 100644 (file)
--- a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
+++ b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.cc
@@ -70,11 +70,7 @@ void GeometryMapperTransformCache::Update(
     to_2d_translation_root_ += translation;
 
     if (parent.plane_root_transform_) {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       plane_root_transform_.emplace();
-#else
-      plane_root_transform_.emplace(PlaneRootTransform());
-#endif
       plane_root_transform_->plane_root = parent.plane_root();
       plane_root_transform_->to_plane_root = parent.to_plane_root();
       plane_root_transform_->to_plane_root.Translate(translation.x(),
@@ -102,11 +98,7 @@ void GeometryMapperTransformCache::Update(
       // as the 2d translation root.
       plane_root_transform_ = absl::nullopt;
     } else {
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
       plane_root_transform_.emplace();
-#else
-      plane_root_transform_.emplace(PlaneRootTransform());
-#endif
       plane_root_transform_->plane_root = parent.plane_root();
       plane_root_transform_->to_plane_root.MakeIdentity();
       parent.ApplyToPlaneRoot(plane_root_transform_->to_plane_root);
@@ -148,11 +140,7 @@ void GeometryMapperTransformCache::UpdateScreenTransform(
   parent_node->UpdateScreenTransform();
   const auto& parent = parent_node->GetTransformCache();
 
-#if !defined(EWK_BRINGUP)  // FIXME: m120 bringup
   screen_transform_.emplace();
-#else
-  screen_transform_.emplace(ScreenTransform());
-#endif
   parent.ApplyToScreen(screen_transform_->to_screen);
   if (node.FlattensInheritedTransform())
     screen_transform_->to_screen.Flatten();

diff --git a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.h b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.h
index 1629dd3..a4ea5cb 100644 (file)
--- a/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.h
+++ b/third_party/blink/renderer/platform/graphics/paint/geometry_mapper_transform_cache.h
@@ -213,6 +213,9 @@ class PLATFORM_EXPORT GeometryMapperTransformCache {
     gfx::Transform from_plane_root;
     const TransformPaintPropertyNode* plane_root = nullptr;
     bool has_animation = false;
+#if BUILDFLAG(IS_TIZEN)
+    PlaneRootTransform() {}
+#endif
     USING_FAST_MALLOC(PlaneRootTransform);
   };
   absl::optional<PlaneRootTransform> plane_root_transform_;
@@ -222,6 +225,9 @@ class PLATFORM_EXPORT GeometryMapperTransformCache {
     gfx::Transform projection_from_screen;
     bool projection_from_screen_is_valid = false;
     bool has_animation = false;
+#if BUILDFLAG(IS_TIZEN)
+    ScreenTransform() {}
+#endif
     USING_FAST_MALLOC(ScreenTransform);
   };
   absl::optional<ScreenTransform> screen_transform_;