[M120 Migration] Enable Scroll offset API 33/307733/2
authorManjeet <manjeet.1@partner.samsung.com>
Tue, 12 Mar 2024 17:51:56 +0000 (23:21 +0530)
committerDae-Hyun Ko <dhyuna.ko@samsung.com>
Wed, 20 Mar 2024 03:22:15 +0000 (03:22 +0000)
Remove EWK_BRINGUP to make ewk_view_scroll_pos_get work.

Reference:
https://review.tizen.org/gerrit/294834

Change-Id: Ia343bc64d4e5992124a54d9f77472d138060f84e
Signed-off-by: Manjeet <manjeet.1@partner.samsung.com>
tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc

index b5ccfa2..08c215b 100644 (file)
@@ -102,8 +102,8 @@ void RenderFrameObserverEfl::OnLoadNotFoundErrorPage(std::string errorUrl) {
   std::string error_html;
   GetContentClientExport()->renderer()->PrepareErrorPage(
       render_frame(), error, failed_request.HttpMethod().Ascii(), &error_html);
-  render_frame()->LoadHTMLString(error_html, GURL(kUnreachableWebDataURL), "UTF-8",
-                                 web_url, replace);
+  render_frame()->LoadHTMLString(error_html, GURL(kUnreachableWebDataURL),
+                                 "UTF-8", web_url, replace);
 #endif
 }
 
@@ -157,30 +157,32 @@ void RenderFrameObserverEfl::OnRequestSelectCollectionInformation() {
 }
 
 void RenderFrameObserverEfl::DidChangeScrollOffset() {
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-  if (render_frame()->GetRenderView()->GetMainRenderFrame() != render_frame())
+  if (render_frame()->GetMainRenderFrame() != render_frame()) {
     return;
+  }
   blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
-  blink::WebSize documentSize = frame->DocumentSize();
-  blink::WebRect visibleContentRect = frame->VisibleContentRect();
-  blink::WebSize maximumScrollOffset(
-      documentSize.width - visibleContentRect.width,
-      documentSize.height - visibleContentRect.height);
+  gfx::Size documentSize = frame->DocumentSize();
+  gfx::Rect visibleContentRect = frame->VisibleContentRect();
+  gfx::Size maximumScrollOffset(
+      documentSize.width() - visibleContentRect.width(),
+      documentSize.height() - visibleContentRect.height());
 
   if (max_scroll_offset_ != maximumScrollOffset) {
     max_scroll_offset_ = maximumScrollOffset;
     Send(new EwkHostMsg_DidChangeMaxScrollOffset(render_frame()->GetRoutingID(),
-                                                 maximumScrollOffset.width,
-                                                 maximumScrollOffset.height));
+                                                 maximumScrollOffset.width(),
+                                                 maximumScrollOffset.height()));
   }
 
-  if (last_scroll_offset_ != frame->GetScrollOffset()) {
-    last_scroll_offset_ = frame->GetScrollOffset();
+  gfx::Size scrollOffsetSize(frame->GetScrollOffset().x(),
+                             frame->GetScrollOffset().y());
+
+  if (last_scroll_offset_ != scrollOffsetSize) {
+    last_scroll_offset_ = scrollOffsetSize;
     Send(new EwkHostMsg_DidChangeScrollOffset(render_frame()->GetRoutingID(),
-                                              frame->GetScrollOffset().width,
-                                              frame->GetScrollOffset().height));
+                                              last_scroll_offset_.width(),
+                                              last_scroll_offset_.height()));
   }
-#endif
 }
 
 void RenderFrameObserverEfl::WillSubmitForm(