[M73 Dev][EFL] Fix compilation and linker errors for desktop build

This commit resolves compiler and linker errors to enable EFL port.

Change-Id: Ic83ff065fadee8e83b2d4b81b851457982571462
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>

diff --git a/gpu/command_buffer/client/gles2_implementation_efl_autogen.h b/gpu/command_buffer/client/gles2_implementation_efl_autogen.h
index e1b8d32..9a80ba0 100644 (file)
--- a/gpu/command_buffer/client/gles2_implementation_efl_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_efl_autogen.h
@@ -916,6 +916,41 @@ void GLES2ImplementationEfl::ShallowFlushCHROMIUM() {
 
 void GLES2ImplementationEfl::OrderingBarrierCHROMIUM() {}
 
+void GLES2ImplementationEfl::MultiDrawArraysWEBGL(GLenum /* mode */,
+                                                  const GLint* /* firsts */,
+                                                  const GLsizei* /* counts */,
+                                                  GLsizei /* drawcount */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::MultiDrawArraysInstancedWEBGL(
+    GLenum /* mode */,
+    const GLint* /* firsts */,
+    const GLsizei* /* counts */,
+    const GLsizei* /* instance_counts */,
+    GLsizei /* drawcount */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::MultiDrawElementsWEBGL(
+    GLenum /* mode */,
+    const GLsizei* /* counts */,
+    GLenum /* type */,
+    const GLsizei* /* offsets */,
+    GLsizei /* drawcount */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::MultiDrawElementsInstancedWEBGL(
+    GLenum /* mode */,
+    const GLsizei* /* counts */,
+    GLenum /* type */,
+    const GLsizei* /* offsets */,
+    const GLsizei* /* instance_counts */,
+    GLsizei /* drawcount */) {
+  NOTIMPLEMENTED();
+}
+
 void GLES2ImplementationEfl::StencilFunc(GLenum func, GLint ref, GLuint mask) {
   evas_gl_api_->glStencilFunc(func, ref, mask);
 }
@@ -1905,24 +1940,34 @@ GLuint GLES2ImplementationEfl::GetLastFlushIdCHROMIUM() {
   return 0;
 }
 
-void GLES2ImplementationEfl::ScheduleDCLayerSharedStateCHROMIUM(
-    GLfloat /* opacity */,
-    GLboolean /* is_clipped */,
-    const GLfloat* /* clip_rect */,
+void GLES2ImplementationEfl::ScheduleDCLayerCHROMIUM(
+    GLuint /* y_texture_id */,
+    GLuint /* uv_texture_id */,
     GLint /* z_order */,
-    const GLfloat* /* transform */) {
+    GLint /* content_x */,
+    GLint /* content_y */,
+    GLint /* content_width */,
+    GLint /* content_height */,
+    GLint /* quad_x */,
+    GLint /* quad_y */,
+    GLint /* quad_width */,
+    GLint /* quad_height */,
+    GLfloat /* transform_c1r1 */,
+    GLfloat /* transform_c2r1 */,
+    GLfloat /* transform_c1r2 */,
+    GLfloat /* transform_c2r2 */,
+    GLfloat /* transform_tx */,
+    GLfloat /* transform_ty */,
+    GLboolean /* is_clipped */,
+    GLint /* clip_x */,
+    GLint /* clip_y */,
+    GLint /* clip_width */,
+    GLint /* clip_height */,
+    GLuint /* protected_video_type */) {
   NOTIMPLEMENTED();
 }
 
-void GLES2ImplementationEfl::ScheduleDCLayerCHROMIUM(
-    GLsizei /* num_textures */,
-    const GLuint* /* contents_texture_ids */,
-    const GLfloat* /* contents_rect */,
-    GLuint /* background_color */,
-    GLuint /* edge_aa_mask */,
-    const GLfloat* /* bounds_rect */,
-    GLuint /* filter */,
-    bool /* is_protected_video */) {
+void GLES2ImplementationEfl::SetActiveURLCHROMIUM(const char* /* url */) {
   NOTIMPLEMENTED();
 }
 
@@ -2255,4 +2300,21 @@ void GLES2ImplementationEfl::MaxShaderCompilerThreadsKHR(GLuint /* count */) {
   NOTIMPLEMENTED();
 }
 
+GLuint GLES2ImplementationEfl::CreateAndTexStorage2DSharedImageCHROMIUM(
+    const GLbyte* /* mailbox */) {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
+void GLES2ImplementationEfl::BeginSharedImageAccessDirectCHROMIUM(
+    GLuint /* texture */,
+    GLenum /* mode */) {
+  NOTIMPLEMENTED();
+}
+
+void GLES2ImplementationEfl::EndSharedImageAccessDirectCHROMIUM(
+    GLuint /* texture */) {
+  NOTIMPLEMENTED();
+}
+
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_AUTOGEN_H_

diff --git a/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h b/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h
index 87372d4..5510ee8 100644 (file)
--- a/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h
@@ -373,6 +373,26 @@ void ShaderSource(GLuint shader,
 void ShallowFinishCHROMIUM() override;
 void ShallowFlushCHROMIUM() override;
 void OrderingBarrierCHROMIUM() override;
+void MultiDrawArraysWEBGL(GLenum mode,
+                          const GLint* firsts,
+                          const GLsizei* counts,
+                          GLsizei drawcount) override;
+void MultiDrawArraysInstancedWEBGL(GLenum mode,
+                                   const GLint* firsts,
+                                   const GLsizei* counts,
+                                   const GLsizei* instance_counts,
+                                   GLsizei drawcount) override;
+void MultiDrawElementsWEBGL(GLenum mode,
+                            const GLsizei* counts,
+                            GLenum type,
+                            const GLsizei* offsets,
+                            GLsizei drawcount) override;
+void MultiDrawElementsInstancedWEBGL(GLenum mode,
+                                     const GLsizei* counts,
+                                     GLenum type,
+                                     const GLsizei* offsets,
+                                     const GLsizei* instance_counts,
+                                     GLsizei drawcount) override;
 void StencilFunc(GLenum func, GLint ref, GLuint mask) override;
 void StencilFuncSeparate(GLenum face,
                          GLenum func,
@@ -771,19 +791,30 @@ void ScheduleCALayerInUseQueryCHROMIUM(GLsizei count,
 void CommitOverlayPlanesCHROMIUM(GLuint64 swap_id, GLbitfield flags) override;
 void FlushDriverCachesCHROMIUM() override;
 GLuint GetLastFlushIdCHROMIUM() override;
-void ScheduleDCLayerSharedStateCHROMIUM(GLfloat opacity,
-                                        GLboolean is_clipped,
-                                        const GLfloat* clip_rect,
-                                        GLint z_order,
-                                        const GLfloat* transform) override;
-void ScheduleDCLayerCHROMIUM(GLsizei num_textures,
-                             const GLuint* contents_texture_ids,
-                             const GLfloat* contents_rect,
-                             GLuint background_color,
-                             GLuint edge_aa_mask,
-                             const GLfloat* bounds_rect,
-                             GLuint filter,
-                             bool is_protected_video) override;
+void ScheduleDCLayerCHROMIUM(GLuint y_texture_id,
+                             GLuint uv_texture_id,
+                             GLint z_order,
+                             GLint content_x,
+                             GLint content_y,
+                             GLint content_width,
+                             GLint content_height,
+                             GLint quad_x,
+                             GLint quad_y,
+                             GLint quad_width,
+                             GLint quad_height,
+                             GLfloat transform_c1r1,
+                             GLfloat transform_c2r1,
+                             GLfloat transform_c1r2,
+                             GLfloat transform_c2r2,
+                             GLfloat transform_tx,
+                             GLfloat transform_ty,
+                             GLboolean is_clipped,
+                             GLint clip_x,
+                             GLint clip_y,
+                             GLint clip_width,
+                             GLint clip_height,
+                             GLuint protected_video_type) override;
+void SetActiveURLCHROMIUM(const char* url) override;
 void MatrixLoadfCHROMIUM(GLenum matrixMode, const GLfloat* m) override;
 void MatrixLoadIdentityCHROMIUM(GLenum matrixMode) override;
 GLuint GenPathsCHROMIUM(GLsizei range) override;
@@ -927,4 +958,7 @@ void FramebufferTextureMultiviewLayeredANGLE(GLenum target,
                                              GLint baseViewIndex,
                                              GLsizei numViews) override;
 void MaxShaderCompilerThreadsKHR(GLuint count) override;
+GLuint CreateAndTexStorage2DSharedImageCHROMIUM(const GLbyte* mailbox) override;
+void BeginSharedImageAccessDirectCHROMIUM(GLuint texture, GLenum mode) override;
+void EndSharedImageAccessDirectCHROMIUM(GLuint texture) override;
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_HEADER_AUTOGEN_H_

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
index 4ee40d3..606dfef 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
@@ -602,7 +602,7 @@ bool RenderWidgetHostViewEfl::IsSurfaceAvailableForCopy() const {
   return false;
 }
 
-void RenderWidgetHostViewEfl::EnsureSurfaceSynchronizedForLayoutTest() {
+void RenderWidgetHostViewEfl::EnsureSurfaceSynchronizedForWebTest() {
   NOTIMPLEMENTED();
 }
 
@@ -610,8 +610,9 @@ const viz::FrameSinkId& RenderWidgetHostViewEfl::GetFrameSinkId() const {
   return viz::FrameSinkId();
 }
 
-const viz::LocalSurfaceId& RenderWidgetHostViewEfl::GetLocalSurfaceId() const {
-  return viz::ParentLocalSurfaceIdAllocator::InvalidLocalSurfaceId();
+const viz::LocalSurfaceIdAllocation&
+RenderWidgetHostViewEfl::GetLocalSurfaceIdAllocation() const {
+  return viz::ParentLocalSurfaceIdAllocator::InvalidLocalSurfaceIdAllocation();
 }
 
 void RenderWidgetHostViewEfl::UpdateBackgroundColor() {
@@ -712,7 +713,9 @@ void RenderWidgetHostViewEfl::SetBackgroundColor(SkColor color) {
 
   DCHECK(SkColorGetA(color) == SK_AlphaOPAQUE ||
          SkColorGetA(color) == SK_AlphaTRANSPARENT);
+#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
   host_->SetBackgroundOpaque(SkColorGetA(color) == SK_AlphaOPAQUE);
+#endif  // EWK_BRINGUP
 }
 
 SkColor RenderWidgetHostViewEfl::background_color() const {

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
index 7d58478..dd87152 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
@@ -90,6 +90,7 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   gfx::NativeView GetNativeView() const override;
   gfx::NativeViewAccessible GetNativeViewAccessible() override;
   bool IsSurfaceAvailableForCopy() const override;
+  void EnsureSurfaceSynchronizedForWebTest() override;
   void Show() override;
   void Hide() override;
   bool IsShowing() override;
@@ -104,9 +105,9 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   SkColor background_color() const;
   void TakeFallbackContentFrom(RenderWidgetHostView* view) override;
   viz::SurfaceId GetCurrentSurfaceId() const override;
-  void EnsureSurfaceSynchronizedForLayoutTest() override;
   const viz::FrameSinkId& GetFrameSinkId() const override;
-  const viz::LocalSurfaceId& GetLocalSurfaceId() const override;
+  const viz::LocalSurfaceIdAllocation& GetLocalSurfaceIdAllocation()
+      const override;
   void UpdateBackgroundColor() override;
 
   void UpdateBackgroundColorFromRenderer(SkColor color);
@@ -140,7 +141,7 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl
   void DidOverscroll(const ui::DidOverscrollParams& params) override;
   gfx::Rect GetBoundsInRootWindow() override;
   void RenderProcessGone(base::TerminationStatus, int) override;
-  bool OnMessageReceived(const IPC::Message&) override;
+  bool OnMessageReceived(const IPC::Message&);
 
   void OnFilteredMessageReceived(const IPC::Message&);
 

diff --git a/tizen_src/chromium_impl/content/common/message_generator_efl.cc b/tizen_src/chromium_impl/content/common/message_generator_efl.cc
index 570a9fb..c8606b3 100644 (file)
--- a/tizen_src/chromium_impl/content/common/message_generator_efl.cc
+++ b/tizen_src/chromium_impl/content/common/message_generator_efl.cc
@@ -10,10 +10,6 @@
 #include "ipc/struct_constructor_macros.h"
 #include "content/common/message_generator_efl.h"
 
-// Generate destructors.
-#include "ipc/struct_destructor_macros.h"
-#include "content/common/message_generator_efl.h"
-
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {

diff --git a/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc b/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
index 696ef90..a7ebd9f 100644 (file)
--- a/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
+++ b/tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
@@ -10,15 +10,15 @@
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
+#include "cc/base/switches.h"
+#include "components/js_dialogs_efl/javascript_dialog_manager_efl.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/shell/browser/web_test/web_test_javascript_dialog_manager.h"
 #include "content/shell/common/shell_switches.h"
-#include "content/shell/browser/layout_test/layout_test_javascript_dialog_manager.h"
-#include "components/js_dialogs_efl/javascript_dialog_manager_efl.h"
 #include "efl/window_factory.h"
 #include "ui/gl/gl_switches.h"
-#include "cc/base/switches.h"
 
 namespace content {
 
@@ -221,7 +221,7 @@ JavaScriptDialogManager* Shell::GetJavaScriptDialogManager(
     WebContents* source) {
   if (!dialog_manager_) {
     if (switches::IsRunWebTestsSwitchPresent()) {
-      dialog_manager_.reset(new LayoutTestJavaScriptDialogManager);
+      dialog_manager_.reset(new WebTestJavaScriptDialogManager);
     } else {
       dialog_manager_.reset(new JavaScriptDialogManagerEfl);
     }

diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
index f15c2cd..93c5427 100644 (file)
--- a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
+++ b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
@@ -54,7 +54,7 @@ bool GLES2ImplementationEfl::ThreadsafeDiscardableTextureIsDeletedForTracing(
   return false;
 }
 
-void* GLES2ImplementationEfl::MapTransferCacheEntry(size_t serialized_size) {
+void* GLES2ImplementationEfl::MapTransferCacheEntry(uint32_t serialized_size) {
   NOTIMPLEMENTED();
   return nullptr;
 }

diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
index f21281c..85fd443 100644 (file)
--- a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
+++ b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
@@ -70,7 +70,7 @@ class GLES2_IMPL_EXPORT GLES2ImplementationEfl : public ContextSupport,
       uint32_t texture_id) override {}
   bool ThreadsafeDiscardableTextureIsDeletedForTracing(
       uint32_t texture_id) override;
-  void* MapTransferCacheEntry(size_t serialized_size) override;
+  void* MapTransferCacheEntry(uint32_t serialized_size) override;
   void UnmapAndCreateTransferCacheEntry(uint32_t type, uint32_t id) override {}
   bool ThreadsafeLockTransferCacheEntry(uint32_t entry_type,
                                         uint32_t entry_id) override;

diff --git a/tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h b/tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h
index 6b951d4..c39ef1e 100644 (file)
--- a/tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h
+++ b/tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h
@@ -20,7 +20,7 @@ class ClipboardEfl: public Clipboard {
   void OnPreShutdown() override;
 
   uint64_t GetSequenceNumber(ClipboardType type) const override;
-  bool IsFormatAvailable(const FormatType& format,
+  bool IsFormatAvailable(const ClipboardFormatType& format,
                          ClipboardType type) const override;
   void Clear(ClipboardType type) override;
   void ReadAvailableTypes(ClipboardType type,
@@ -40,7 +40,8 @@ class ClipboardEfl: public Clipboard {
   void ReadCustomData(ClipboardType clipboard_type,
                       const base::string16& type,
                       base::string16* result) const override;
-  void ReadData(const FormatType& format, std::string* result) const override;
+  void ReadData(const ClipboardFormatType& format,
+                std::string* result) const override;
   void WriteText(const char* text_data, size_t text_len) override;
 
   void WriteHTML(const char* markup_data,
@@ -59,7 +60,7 @@ class ClipboardEfl: public Clipboard {
 
   void WriteBitmap(const SkBitmap& bitmap) override;
 
-  void WriteData(const FormatType& format,
+  void WriteData(const ClipboardFormatType& format,
                  const char* data_data,
                  size_t data_len) override;
 };

diff --git a/tizen_src/chromium_impl/ui/ui_efl.gni b/tizen_src/chromium_impl/ui/ui_efl.gni
index 7395b2a..438582a 100644 (file)
--- a/tizen_src/chromium_impl/ui/ui_efl.gni
+++ b/tizen_src/chromium_impl/ui/ui_efl.gni
@@ -98,14 +98,23 @@ if (wayland_bringup) {
 # For //ui/base target
 external_ui_base_includes = [ "//third_party/mojo/src/" ]
 external_ui_base_sources = [
+  "clipboard/clipboard_aura.cc",
+  "clipboard/clipboard_aura.h",
+  "clipboard/clipboard_format_type_aura.cc",
   "//ui/base/nine_image_painter_factory.h",
   "//tizen_src/chromium_impl/ui/base/resource/resource_bundle_efl.cc",
-  "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.cc",
-  "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h",
   "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.cc",
   "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h",
 ]
 
+# FIXME: ewk_bringup definition should be removed.
+if (!ewk_bringup) {
+  sources += [
+    "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.cc",
+    "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_efl.h",
+  ]
+}
+
 # EWK_BRINGUP
 #if (use_x11) {
 #  if (!wayland_bringup) {

diff --git a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
index a1eb65b..8be880d 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
@@ -14,12 +14,12 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/dom_storage_context.h"
-#include "content/public/browser/local_storage_usage_info.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
+#include "content/public/browser/storage_usage_info.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
@@ -27,7 +27,6 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "storage/browser/quota/quota_manager.h"
-//#include "storage/common/quota/quota_types.h"
 
 using content::BrowserThread;
 
@@ -274,7 +273,7 @@ void BrowsingDataRemoverEfl::ClearLocalStorageOnUIThread() {
 }
 
 void BrowsingDataRemoverEfl::OnGotLocalStorageUsageInfo(
-  const std::vector<content::LocalStorageUsageInfo>& infos) {
+    const std::vector<content::StorageUsageInfo>& infos) {
   DCHECK(waiting_for_clear_local_storage_);
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   for (size_t i = 0; i < infos.size(); ++i) {

diff --git a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h
index 80684dd..c30d2be 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h
+++ b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h
@@ -12,7 +12,6 @@
 #include "base/time/time.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-//#include "storage/common/quota/quota_types.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 
@@ -23,7 +22,7 @@ namespace content {
 class AppCacheService;
 class BrowserContext;
 class DOMStorageContext;
-struct LocalStorageUsageInfo;
+struct StorageUsageInfo;
 class StoragePartition;
 }
 namespace disk_cache {
@@ -70,7 +69,8 @@ class BrowsingDataRemoverEfl {
   void ClearLocalStorageOnUIThread();
 
   // Callback to deal with the list gathered in ClearLocalStorageOnUIThread.
-  void OnGotLocalStorageUsageInfo(const std::vector<content::LocalStorageUsageInfo>&);
+  void OnGotLocalStorageUsageInfo(
+      const std::vector<content::StorageUsageInfo>&);
 
   // Invoked on the IO thread to delete all storage types managed by the quota
   // system: AppCache, Databases, FileSystems.

diff --git a/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc
index 901a8bb..0c2455f 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc
@@ -28,10 +28,9 @@ const uint32_t kFilteredMessageClasses[] = {
 };
 
 RenderMessageFilterEfl::RenderMessageFilterEfl(int render_process_id)
-  : BrowserMessageFilter(kFilteredMessageClasses,
-        arraysize(kFilteredMessageClasses))
-  , render_process_id_(render_process_id) {
-}
+    : BrowserMessageFilter(kFilteredMessageClasses,
+                           base::size(kFilteredMessageClasses)),
+      render_process_id_(render_process_id) {}
 
 RenderMessageFilterEfl::~RenderMessageFilterEfl() { }
 

diff --git a/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.cc
index e6474eb..8891470 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.cc
@@ -5,9 +5,9 @@
 #include "browser/web_cache_efl/web_cache_manager_efl.h"
 
 #include "base/logging.h"
-#include "base/sys_info.h"
-#include "common/render_messages_ewk.h"
+#include "base/system/sys_info.h"
 #include "common/cache_params_efl.h"
+#include "common/render_messages_ewk.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"

diff --git a/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc
index 92c8dbe..55f50d8 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc
+++ b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc
@@ -169,13 +169,11 @@ class WebViewBrowserMessageFilterPrivate
   content::NotificationRegistrar registrar_;
 };
 
-
 WebViewBrowserMessageFilter::WebViewBrowserMessageFilter(
     content::WebContents* web_contents)
     : BrowserMessageFilter(kFilteredMessageClasses,
-                           arraysize(kFilteredMessageClasses)),
-      private_(new WebViewBrowserMessageFilterPrivate(web_contents)) {
-}
+                           base::size(kFilteredMessageClasses)),
+      private_(new WebViewBrowserMessageFilterPrivate(web_contents)) {}
 
 WebViewBrowserMessageFilter::~WebViewBrowserMessageFilter() {
   // Due to NotificationRegistrar private_ shall be destroyed in UI thread

diff --git a/tizen_src/ewk/efl_integration/browser_context_efl.cc b/tizen_src/ewk/efl_integration/browser_context_efl.cc
index cb574d4..a3b32b4 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser_context_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser_context_efl.cc
@@ -329,6 +329,11 @@ BrowserContextEfl::GetGeolocationPermissionContext() const {
   return *(geolocation_permission_context_.get());
 }
 
+ClientHintsControllerDelegate*
+BrowserContextEfl::GetClientHintsControllerDelegate() {
+  return nullptr;
+}
+
 BackgroundFetchDelegate* BrowserContextEfl::GetBackgroundFetchDelegate() {
   return nullptr;
 }

diff --git a/tizen_src/ewk/efl_integration/browser_context_efl.h b/tizen_src/ewk/efl_integration/browser_context_efl.h
index 27d3b3f..dfb2a28 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser_context_efl.h
+++ b/tizen_src/ewk/efl_integration/browser_context_efl.h
@@ -47,7 +47,7 @@ class BrowserContextEfl : public BrowserContext,
     const HTTPCustomHeadersEflMap GetHTTPCustomHeadersEflMap() const;
 
     net::HostResolver* GetHostResolver();
-    net::URLRequestContext* GetRequestContext() override;
+    net::URLRequestContext* GetRequestContext();
     void set_url_request_context_getter(URLRequestContextGetterEfl* getter);
 
     scoped_refptr<CookieManager> GetCookieManager() const;
@@ -84,7 +84,7 @@ class BrowserContextEfl : public BrowserContext,
   }
   PushMessagingService* GetPushMessagingService() override { return 0; }
   base::FilePath GetPath() const override;
-  base::FilePath GetCachePath() const override;
+  base::FilePath GetCachePath() const;
   BackgroundSyncController* GetBackgroundSyncController() override;
   net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
@@ -93,6 +93,7 @@ class BrowserContextEfl : public BrowserContext,
       URLRequestInterceptorScopedVector request_interceptors) override {
     return nullptr;
   }
+  ClientHintsControllerDelegate* GetClientHintsControllerDelegate() override;
   BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
   BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate() override;
 

diff --git a/tizen_src/ewk/efl_integration/common/content_client_efl.h b/tizen_src/ewk/efl_integration/common/content_client_efl.h
index c02d182..8d4a924 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/content_client_efl.h
+++ b/tizen_src/ewk/efl_integration/common/content_client_efl.h
@@ -16,8 +16,8 @@ namespace IPC {
 class ContentClientEfl : public content::ContentClient {
  public:
   // ContentClient implementation.
-  virtual std::string GetProduct() const override;
-  virtual std::string GetUserAgent() const override;
+  std::string GetProduct() const;
+  std::string GetUserAgent() const;
   virtual base::string16 GetLocalizedString(int message_id) const override;
   virtual base::StringPiece GetDataResource(
       int resource_id,

diff --git a/tizen_src/ewk/efl_integration/common/editing_messages.h b/tizen_src/ewk/efl_integration/common/editing_messages.h
index bf09df4..ac3cee0 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/editing_messages.h
+++ b/tizen_src/ewk/efl_integration/common/editing_messages.h
@@ -20,29 +20,29 @@
 // Notification message carrying undo stack size after executing undo
 IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyUndo,
                     int, /* render view ID */
-                    size_t /* size of the undo stack */)
+                    uint32_t /* size of the undo stack */)
 
 // Notification message carrying redo stack size after executing redo
 IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyRedo,
                     int, /* render view ID */
-                    size_t /* size of the redo stack */)
+                    uint32_t /* size of the redo stack */)
 
 // Notification message carrying undo stack size after registering undo
 IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyRegisterUndo,
                     int, /* render view ID */
-                    size_t /* size of the undo stack */)
+                    uint32_t /* size of the undo stack */)
 
 // Notification message carrying redo stack size after registering redo
 IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyRegisterRedo,
                     int, /* render view ID */
-                    size_t /* size of the redo stack */)
+                    uint32_t /* size of the redo stack */)
 
 // Notification message carrying undo stack size after clearing undo stack
 IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyClearUndo,
                     int, /* render view ID */
-                    size_t /* size of the undo stack */)
+                    uint32_t /* size of the undo stack */)
 
 // Notification message carrying redo stack size after clearing redo stack
 IPC_MESSAGE_ROUTED2(EditingHostMsg_NotifyClearRedo,
                     int, /* render view ID */
-                    size_t /* size of the redo stack */)
+                    uint32_t /* size of the redo stack */)

diff --git a/tizen_src/ewk/efl_integration/common/message_generator_ewk.cc b/tizen_src/ewk/efl_integration/common/message_generator_ewk.cc
index 9699d26..0bd677c 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/message_generator_ewk.cc
+++ b/tizen_src/ewk/efl_integration/common/message_generator_ewk.cc
@@ -10,10 +10,6 @@
 #include "ipc/struct_constructor_macros.h"
 #include "common/message_generator_ewk.h"
 
-// Generate destructors.
-#include "ipc/struct_destructor_macros.h"
-#include "common/message_generator_ewk.h"
-
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {

diff --git a/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc b/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc
index 0a5bcff..56ec05b 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc
+++ b/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc
@@ -8,7 +8,9 @@
 
 NavigationPolicyParams::NavigationPolicyParams()
     : render_view_id(-1),
+#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
       policy(blink::kWebNavigationPolicyIgnore),
+#endif
       type(blink::kWebNavigationTypeOther),
       should_replace_current_entry(false),
       is_main_frame(false),

diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.h b/tizen_src/ewk/efl_integration/content_browser_client_efl.h
index a9fb6d5..ceea7ba 100644 (file)
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.h
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.h
@@ -53,7 +53,7 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
                        const blink::mojom::WindowFeatures& features,
                        bool user_gesture,
                        bool opener_suppressed,
-                       bool* no_javascript_access) override;
+                       bool* no_javascript_access);
 
   virtual void ResourceDispatcherHostCreated() override;
 

diff --git a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
index 9820e8b..dd54ef2 100644 (file)
--- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
@@ -21,7 +21,6 @@
 #include "net/base/filename_util.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "private/ewk_context_menu_private.h"
-#include "third_party/blink/public/platform/web_referrer_policy.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_helper_efl.h"
 
@@ -629,7 +628,7 @@ void ContextMenuControllerEfl::OpenURL(
   content::OpenURLParams params(
       url,
       content::Referrer(web_contents_.GetVisibleURL(),
-                        blink::kWebReferrerPolicyAlways),
+                        network::mojom::ReferrerPolicy::kAlways),
       -1, /* -1 to indicate the main frame */
       disposition, ui::PAGE_TRANSITION_LINK, false);
 

diff --git a/tizen_src/ewk/efl_integration/eweb_context.cc b/tizen_src/ewk/efl_integration/eweb_context.cc
index 4ccd687..3783fa9 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_context.cc
+++ b/tizen_src/ewk/efl_integration/eweb_context.cc
@@ -20,9 +20,9 @@
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/dom_storage_context.h"
-#include "content/public/browser/local_storage_usage_info.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
+#include "content/public/browser/storage_usage_info.h"
 #include "net/http/http_cache.h"
 #include "net/proxy_resolution/proxy_config_service_fixed.h"
 #include "net/proxy_resolution/proxy_resolution_service.h"
@@ -85,16 +85,16 @@ class WebStorageGetAllOriginsDispatcher
     DCHECK(user_data_);
   }
 
-  void Dispatch(
-      const std::vector<content::LocalStorageUsageInfo>& local_storage) {
+  void Dispatch(const std::vector<content::StorageUsageInfo>& local_storage) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     Eina_List* lorigins = NULL;
 
-    std::vector<content::LocalStorageUsageInfo>::const_iterator it;
+    std::vector<content::StorageUsageInfo>::const_iterator it;
 
     for (it = local_storage.begin(); it != local_storage.end(); it++) {
-      _Ewk_Security_Origin* origin = new _Ewk_Security_Origin(it->origin);
+      _Ewk_Security_Origin* origin =
+          new _Ewk_Security_Origin(it->origin.GetURL());
       lorigins = eina_list_append(lorigins, origin);
     }
 
@@ -606,8 +606,8 @@ void EWebContext::WebStorageDeleteForOrigin(const GURL& origin) {
   content::StoragePartition* partition =
       BrowserContext::GetStoragePartition(browser_context_.get(), NULL);
 
-  partition->GetDOMStorageContext()->DeleteLocalStorage(origin,
-                                                        base::DoNothing());
+  partition->GetDOMStorageContext()->DeleteLocalStorage(
+      url::Origin::Create(origin), base::DoNothing());
 }
 
 void EWebContext::WebStorageOriginsAllGet(

diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc
index 028bf88..7041403 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.cc
+++ b/tizen_src/ewk/efl_integration/eweb_view.cc
@@ -711,8 +711,7 @@ bool EWebView::ExecuteJavaScript(const char* script,
 }
 
 bool EWebView::SetUserAgent(const char* userAgent) {
-  const content::NavigationController& controller =
-      web_contents_->GetController();
+  content::NavigationController& controller = web_contents_->GetController();
   bool override = userAgent && strlen(userAgent);
   for (int i = 0; i < controller.GetEntryCount(); ++i)
     controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(override);
@@ -764,8 +763,10 @@ void EWebView::set_magnifier(bool status) {
 const char* EWebView::GetUserAgent() const {
   if (!web_contents_->GetUserAgentOverride().empty())
     user_agent_ = web_contents_->GetUserAgentOverride();
+#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
   else
     user_agent_ = content::GetContentClientExport()->GetUserAgent();
+#endif
   return user_agent_.c_str();
 }
 
@@ -1909,7 +1910,7 @@ void EWebView::GetSessionData(const char** data, unsigned* length) const {
     NavigationEntry* navigationEntry = navigationController.GetEntryAtIndex(i);
     sessions::SerializedNavigationEntry serializedEntry =
         sessions::ContentSerializedNavigationBuilder::FromNavigationEntry(
-            i, *navigationEntry);
+            i, navigationEntry);
     serializedEntry.WriteToPickle(MAX_SESSION_ENTRY_SIZE, &sessionPickle);
   }
 

diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc
index bcb3306..99f3adf 100644 (file)
--- a/tizen_src/ewk/efl_integration/ewk_global_data.cc
+++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc
@@ -156,7 +156,7 @@ EwkGlobalData* EwkGlobalData::GetInstance() {
   content::StartBrowserTaskScheduler();
   content::BrowserTaskExecutor::Create();
 
-  instance_->browser_main_runner_ = BrowserMainRunner::Create();
+  instance_->browser_main_runner_ = BrowserMainRunner::Create().get();
   instance_->browser_main_runner_->Initialize(main_funtion_params);
 
   base::ThreadRestrictions::SetIOAllowed(true);

diff --git a/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.cc b/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.cc
index 277f890..738aa0f 100644 (file)
--- a/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.cc
+++ b/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.cc
@@ -30,5 +30,9 @@ std::string HttpUserAgentSettingsEfl::GetAcceptLanguage() const {
 }
 
 std::string HttpUserAgentSettingsEfl::GetUserAgent() const {
+#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
   return content::GetContentClientExport()->GetUserAgent();
+#else
+  return std::string();
+#endif
 }

diff --git a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc b/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
index 845a813..198175a 100644 (file)
--- a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
+++ b/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc
@@ -154,6 +154,7 @@ void MessagePumpForUIEfl::DoWork() {
     work_scheduled_ = false;
   }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
   Delegate* delegate = base::MessageLoopForUI::current();
 
 // Added as part M67 bringup need to check why
@@ -188,6 +189,7 @@ void MessagePumpForUIEfl::DoWork() {
 
   if (!delayed_work_time.is_null())
     ScheduleDelayedWork(delayed_work_time);
+#endif  // EWK_BRINGUP
 }
 
 void MessagePumpForUIEfl::DoDelayedWork() {

diff --git a/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.cc b/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.cc
index 60488de..5f1bdc4 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.cc
+++ b/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.cc
@@ -75,7 +75,7 @@ void _Ewk_Back_Forward_List::NewPageCommited(
 }
 
 void _Ewk_Back_Forward_List::UpdateItemWithEntry(
-    const content::NavigationEntry* entry) {
+    content::NavigationEntry* entry) {
   if (entry) {
     CacheMap::iterator it = cache_.find(entry);
     if (it != cache_.end()) {

diff --git a/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.h b/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.h
index 80eb1d2..a64c026 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_back_forward_list_private.h
@@ -24,7 +24,7 @@ class _Ewk_Back_Forward_List_Item
     Update(entry);
   }
 
-  void Update(const content::NavigationEntry* entry) {
+  void Update(content::NavigationEntry* entry) {
     if (entry) {
       url_ = entry->GetURL();
       original_url_ = entry->GetUserTypedURL();
@@ -62,7 +62,7 @@ class _Ewk_Back_Forward_List : public back_forward_list::List,
 
   void NewPageCommited(int prev_entry_index,
                        content::NavigationEntry* new_entry);
-  void UpdateItemWithEntry(const content::NavigationEntry* entry);
+  void UpdateItemWithEntry(content::NavigationEntry* entry);
   void ClearCache();
 
   // FIXME: EWK_BRINGUP: Check the need.

diff --git a/tizen_src/ewk/efl_integration/private/ewk_user_media_private.h b/tizen_src/ewk/efl_integration/private/ewk_user_media_private.h
index 99a64a5..9e3def5 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_user_media_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_user_media_private.h
@@ -8,7 +8,7 @@
 #include <content/public/browser/browser_thread.h>
 
 #include "base/callback.h"
-#include "content/public/common/media_stream_request.h"
+#include "content/public/browser/media_stream_request.h"
 #include "private/ewk_security_origin_private.h"
 #include "public/ewk_security_origin.h"
 #include "web_contents_delegate_efl.h"

diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
index ebfcdad..bcc481a 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
@@ -185,8 +185,8 @@ void ContentRendererClientEfl::DidCreateScriptContext(
     blink::WebFrame* frame,
     v8::Handle<v8::Context> context,
     int world_id) {
-  const content::RenderView* render_view = content::RenderView::FromWebView(
-      frame->View());
+  content::RenderView* render_view =
+      content::RenderView::FromWebView(frame->View());
   if (widget_) {
     widget_->StartSession(context, render_view->GetRoutingID(),
                           frame->ToWebLocalFrame()
@@ -215,12 +215,12 @@ bool ContentRendererClientEfl::HandleNavigation(
     blink::WebNavigationType type,
     blink::WebNavigationPolicy default_policy,
     bool is_redirect) {
-  const content::RenderView* render_view =
+  content::RenderView* render_view =
       content::RenderView::FromWebView(frame->View());
   bool result = false;
   GURL referrer_url(blink::WebStringToGURL(
       request.HttpHeaderField(blink::WebString::FromUTF8("Referer"))));
-  blink::WebReferrerPolicy referrer_policy =
+  network::mojom::ReferrerPolicy referrer_policy =
       request.IsNull()
           ? frame->ToWebLocalFrame()->GetDocument().GetReferrerPolicy()
           : request.GetReferrerPolicy();

diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
index 982af1a..e413e37 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
@@ -45,14 +45,12 @@ using blink::WebURLRequest;
 
 namespace {
 
-typedef blink::WebContentSecurityPolicyType SecurityPolicyType;
-
-static_assert(
-    static_cast<int>(SecurityPolicyType::kWebContentSecurityPolicyTypeReport) ==
-        static_cast<int>(EWK_REPORT_ONLY),
-    "mismatching enums : EWK_REPORT_ONLY");
-static_assert(static_cast<int>(
-                  SecurityPolicyType::kWebContentSecurityPolicyTypeEnforce) ==
+typedef blink::mojom::ContentSecurityPolicyType SecurityPolicyType;
+
+static_assert(static_cast<int>(SecurityPolicyType::kReport) ==
+                  static_cast<int>(EWK_REPORT_ONLY),
+              "mismatching enums : EWK_REPORT_ONLY");
+static_assert(static_cast<int>(SecurityPolicyType::kEnforce) ==
                   static_cast<int>(EWK_ENFORCE_POLICY),
               "mismatching enums : EWK_ENFORCE_POLICY");
 
@@ -321,10 +319,13 @@ bool RenderViewObserverEfl::DoHitTest(int view_x, int view_y, Ewk_Hit_Test_Mode
 
   if (!render_view() || !render_view()->GetWebView())
     return false;
-
+#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
   const blink::WebHitTestResult web_hit_test_result =
       render_view()->GetWebView()->HitTestResultAt(
           blink::WebPoint(view_x, view_y));
+#else
+  blink::WebHitTestResult web_hit_test_result;
+#endif
 
   if (web_hit_test_result.GetNode().IsNull())
     return false;
@@ -627,6 +628,8 @@ void RenderViewObserverEfl::OnSetTextZoomFactor(float zoom_factor) {
     return;
 
   // Hide selection and autofill popups.
+#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
   view->HidePopups();
+#endif
   view->SetTextZoomFactor(zoom_factor);
 }

diff --git a/tizen_src/ewk/efl_integration/text_encoding_map_efl.h b/tizen_src/ewk/efl_integration/text_encoding_map_efl.h
index 6f9d6a1..eeee152 100644 (file)
--- a/tizen_src/ewk/efl_integration/text_encoding_map_efl.h
+++ b/tizen_src/ewk/efl_integration/text_encoding_map_efl.h
@@ -5,10 +5,10 @@
 #ifndef TextEncodingMapEfl_h
 #define TextEncodingMapEfl_h
 
-#include "base/memory/singleton.h"
-
 #include <Eina.h>
-#include "base/containers/hash_tables.h"
+#include <unordered_set>
+
+#include "base/memory/singleton.h"
 
 namespace base {
 template <typename T> struct DefaultSingletonTraits;
@@ -21,7 +21,7 @@ class TextEncodingMapEfl {
  private:
   friend struct base::DefaultSingletonTraits<TextEncodingMapEfl>;
   TextEncodingMapEfl();
-  base::hash_set<std::string> encoding_name_set_;
+  std::unordered_set<std::string> encoding_name_set_;
 };
 
 #endif // TextEncodingRegistry_h

diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 6548c1c..fa47dd2 100644 (file)
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -478,6 +478,11 @@ jumbo_component("base") {
   if (use_aura) {
     deps += [ "//ui/events" ]
     sources += [ "window_tracker_template.h" ]
+  } else {
+    sources -= [
+      "cursor/cursor.cc",
+      "cursor/cursor.h",
+    ]
   }
 
   if (!use_aura || !is_linux) {

diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index 6f47193..2721fcf 100644 (file)
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -193,7 +193,6 @@ constexpr NativeWindow kNullNativeWindow = nullptr;
 typedef ui::Cursor NativeCursor;
 typedef void* NativeView;
 typedef void* NativeWindow;
-typedef SkRegion* NativeRegion;
 typedef ui::Event* NativeEvent;
 constexpr NativeView kNullNativeView = nullptr;
 constexpr NativeWindow kNullNativeWindow = nullptr;