[M41_2272] Chromium upversion to m41_2272 branch

Based on the following patch from SeungSeop Park
<sns.park@samsung.com> (original commit message):

This patch deals with following upstream changes:

1. Include path changes:
   - ui/gfx/point.h => ui/gfx/geometry/point.h
   - ui/gfx/rect.h  => ui/gfx/geometry/rect.h
   - ui/gfx/size.h  => ui/gfx/geometry/size.h

2. Significant changes in notification.
   As for now, related codes have been commented out as hotfix.
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10487

3. An additional argument 'main_frame_routing_id' in
   WebContentsDeletate::ShouldCreateWebContents().
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10488

4. GLContext::SetSwapInterval(int interval) is no longer abstract, and
   a new abstract method GLContext::OnSetSwapInterval() is provided.
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10489

5. Intermediate output folder gen/webkit changed to gen/blink.

6. APIs moved from RenderViewObserver to RenderFrameObserver:
   - WillSubmitForm()
   - DidChangeScrollOffset()
   Patch moves previous implementions for these APIs from
   RenderViewObserverEfl to new added RenderFrameObserverEfl class.
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10490

7. Vibration design changes in upstream.
   See https://codereview.chromium.org/583663003 .
   As for now, the related code has been commented out.
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10491

8. RenderViewObserver::OrientationChangeEvent() removed.
   Patch removes our implementation for the API since it was dummy anyway.

9. commandState() and commandValue() removed from WebFrame (blink).
   Patch temporarily disables references to API using BRINGUP_EWK guard.
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10492

10. Several APIs of NetworkDelegate became abstract.
    From the code diff, it turned out the default implementations for them
    were moved to a newly added class NetworkDelegateImpl.
    The prepared solution is to just change NetworkDelegateEfl so to inherit
    NetworkDelegateImpl to avoid code duplication.

11. API changes in GestureRecognizer.
    Following APIs are no longer available:
    - ProcessTouchEventPostDispatch
    - ProcessTouchEventOnAsyncAck
    Although alternative APIs were found in the class, it seems like the
    behaviours of them are somewhat different from previous counterparts.
    So, rather than providing unverified solution with new APIs, the related
    code is disabled using BRINGUP_EWK guard postponing the proper solution
    as future work.
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10493

12. Type change of ProcessTouchEventPreDispatch()'s first argument.
    - TouchEvent& -> TouchEvent*

13. content::UpdateWebTouchEventFromUIEvent removed.
    See https://codereview.chromium.org/510793003 .
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10494

14. Additional parameter SiteInstance* in Navigator::RequestOpenURL().
    See https://codereview.chromium.org/743773003/ for upstream change.
    Current solution is to give NULL for the argument.
TODO: http://107.108.218.239/bugzilla/show_bug.cgi?id=10495

15. Finally, patch changes branch to dev/m41_2272 in sync_repos.sh and
    updates rpm package version to 41.2272.0.4.

Known Issues:
- With touch related changes (11~13), Touch did not work in mobile target,
  i.e., no IME for input element and no site navigation for link click.
  Since these are considered basic features that can block us to test other
  features, patch walkarounds it by disabling kEnableTouch command line option
  for mobile target (i.e., will use mouse event as in TV).

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=10434
Reviewed by: Antonio Gomes, Piotr Tworek

diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.h
index 8beec1e..5e1d9a0 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.h
+++ b/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.h
@@ -5,14 +5,12 @@
 #ifndef IM_CONTEXT_EFL
 #define IM_CONTEXT_EFL
 
-#include "ui/base/ime/text_input_mode.h"
-#include "ui/base/ime/text_input_type.h"
-#include "ui/base/ime/composition_text.h"
-#include "ui/gfx/rect.h"
+#include <Evas.h>
+
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/browser/renderer_host/web_event_factory_efl.h"
-
-#include <Evas.h>
+#include "ui/base/ime/composition_text.h"
+#include "ui/gfx/geometry/rect.h"
 
 typedef std::queue<base::string16> CommitQueue;
 typedef std::queue<ui::CompositionText> PreeditQueue;

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 b7e59db..e265803 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
@@ -1447,14 +1447,20 @@ void UpdateWebTouchEventAfterDispatch(blink::WebTouchEvent* event,
 }
 
 void RenderWidgetHostViewEfl::HandleTouchEvent(ui::TouchEvent* event) {
-  if (!gesture_recognizer_->ProcessTouchEventPreDispatch(*event, this)) {
+  if (!gesture_recognizer_->ProcessTouchEventPreDispatch(event, this)) {
     event->StopPropagation();
     return;
   }
 
   // Update the touch event first.
+  // [M41_2272] FIXME: UpdateWebTouchEventFromUIEvent has been removed.
+  //                   See https://codereview.chromium.org/510793003.
   blink::WebTouchPoint* point =
-    content::UpdateWebTouchEventFromUIEvent(*event, &touch_event_);
+#if !defined(EWK_BRINGUP)
+      content::UpdateWebTouchEventFromUIEvent(event, &touch_event_);
+#else
+      NULL;
+#endif
   // Forward the touch event only if a touch point was updated, and there's a
   // touch-event handler in the page, and no other touch-event is in the queue.
   // It is important to always consume the event if there is a touch-event
@@ -1479,14 +1485,16 @@ void RenderWidgetHostViewEfl::HandleTouchEvent(ui::TouchEvent* event) {
   if (forwarded)
     return;
 
+#if !defined(EWK_BRINGUP)
   scoped_ptr<ui::GestureRecognizer::Gestures> gestures(
-        gesture_recognizer_->ProcessTouchEventPostDispatch(*event, ui::ER_UNHANDLED, this));
+        gesture_recognizer_->ProcessTouchEventPostDispatch(event, ui::ER_UNHANDLED, this));
   if (!gestures)
     return;
   for (size_t j = 0; j < gestures->size(); ++j) {
     ui::GestureEvent* event = gestures->get().at(j);
     HandleGesture(event);
   }
+#endif
 }
 
 void RenderWidgetHostViewEfl::ProcessAckedTouchEvent(
@@ -1496,6 +1504,7 @@ void RenderWidgetHostViewEfl::ProcessAckedTouchEvent(
   if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, LOCAL_COORDINATES))
     return;
 
+#if !defined(EWK_BRINGUP)
   ui::EventResult result = (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED) ?
       ui::ER_HANDLED : ui::ER_UNHANDLED;
   for (ScopedVector<ui::TouchEvent>::const_iterator iter = events.begin(),
@@ -1509,6 +1518,7 @@ void RenderWidgetHostViewEfl::ProcessAckedTouchEvent(
       }
     }
   }
+#endif
 }
 
 void RenderWidgetHostViewEfl::OnOrientationChangeEvent(int orientation) {

diff --git a/tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc b/tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc
index 5505990..7304ddd 100644 (file)
--- a/tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc
+++ b/tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc
@@ -71,7 +71,7 @@ struct GLSharedContextEflPrivate : public gfx::GLContext {
     return handle_;
   }
 
-  void SetSwapInterval(int) override {
+  void OnSetSwapInterval(int interval) override {
     NOTREACHED();
   }
 

diff --git a/tizen_src/ewk/efl_integration/autofill_popup_view_efl.h b/tizen_src/ewk/efl_integration/autofill_popup_view_efl.h
index 3976ba6..033b07b 100644 (file)
--- a/tizen_src/ewk/efl_integration/autofill_popup_view_efl.h
+++ b/tizen_src/ewk/efl_integration/autofill_popup_view_efl.h
@@ -17,7 +17,7 @@
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "browser/password_manager/password_form_manager.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
 
 using namespace password_manager;
 class EWebView;

diff --git a/tizen_src/ewk/efl_integration/browser/autofill/autofill_manager_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/autofill/autofill_manager_delegate_efl.cc
index 60ed8c8..b76702f 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/autofill/autofill_manager_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/autofill/autofill_manager_delegate_efl.cc
@@ -20,7 +20,7 @@
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/browser_thread.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 #include <Elementary.h>
 #include "tizen_webview/public/tw_web_context.h"
 

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 f0e5d32..563e8b5 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
@@ -192,7 +192,7 @@ void OnGotOriginsWithApplicationCache(Application_Cache_Origins_Get_Callback cal
    BrowsingDataRemoverEfl* BRDE = static_cast<BrowsingDataRemoverEfl*>(user_data);
    //information about end of process is not needed so cb left empty
    net::CompletionCallback cb;
-   for (map<GURL, content::AppCacheInfoVector>::iterator iter = collection->infos_by_origin.begin();
+   for (std::map<GURL, content::AppCacheInfoVector>::iterator iter = collection->infos_by_origin.begin();
        iter != collection->infos_by_origin.end();
        ++iter) {
      BRDE->DeleteAppCachesForOrigin(iter->first);

diff --git a/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.cc
index de12fb6..aec76a8 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.cc
+++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.cc
@@ -19,7 +19,6 @@
 #include "components/autofill/core/common/password_form.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "ui/gfx/rect.h"
 
 namespace password_manager {
 PasswordGenerationManager::PasswordGenerationManager(

diff --git a/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.h
index 9de9c2c..04281ff 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.h
+++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.h
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 
 namespace autofill {

diff --git a/tizen_src/ewk/efl_integration/browser_context_efl.cc b/tizen_src/ewk/efl_integration/browser_context_efl.cc
index 3cdd730..def3d80 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser_context_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser_context_efl.cc
@@ -87,7 +87,7 @@ bool BrowserContextEfl::ResourceContextEfl::HTTPCustomHeaderAdd(
 bool BrowserContextEfl::ResourceContextEfl::HTTPCustomHeaderRemove(
     const char* name) {
   base::AutoLock locker(http_custom_headers_lock_);
-  return http_custom_headers_.erase(string(name));
+  return http_custom_headers_.erase(std::string(name));
 }
 
 void BrowserContextEfl::ResourceContextEfl::HTTPCustomHeaderClear() {

diff --git a/tizen_src/ewk/efl_integration/command_line_efl.cc b/tizen_src/ewk/efl_integration/command_line_efl.cc
index fe7124f..3d2f5bf 100644 (file)
--- a/tizen_src/ewk/efl_integration/command_line_efl.cc
+++ b/tizen_src/ewk/efl_integration/command_line_efl.cc
@@ -78,7 +78,10 @@ content::MainFunctionParams CommandLineEfl::GetDefaultPortParams() {
 #endif
 
 #if defined(OS_TIZEN_MOBILE)
+// [M34_2272] FIXME: Temporarily disable touch due to upstream change.
+#if !defined(EWK_BRINGUP)
   p_command_line->AppendSwitch(switches::kTouchEvents);
+#endif
   p_command_line->AppendSwitch(switches::kEnablePinch);
   p_command_line->AppendSwitch(switches::kUseMobileUserAgent);
   p_command_line->AppendSwitch(switches::kEnableViewportMeta);

diff --git a/tizen_src/ewk/efl_integration/common/print_pages_params.h b/tizen_src/ewk/efl_integration/common/print_pages_params.h
index 5056a36..46f9f04 100644 (file)
--- a/tizen_src/ewk/efl_integration/common/print_pages_params.h
+++ b/tizen_src/ewk/efl_integration/common/print_pages_params.h
@@ -12,8 +12,8 @@
 #include "base/memory/shared_memory.h"
 #include "printing/printing_export.h"
 #include "third_party/WebKit/public/web/WebPrintScalingOption.h"
-#include "ui/gfx/rect.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 struct PrintParams {
   PrintParams();

diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
index b58b013..b072063 100644 (file)
--- a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
+++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc
@@ -24,7 +24,7 @@
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/show_desktop_notification_params.h"
+#include "content/public/common/platform_notification_data.h"
 #include "common/web_contents_utils.h"
 
 #if defined(OS_TIZEN)
@@ -286,7 +286,9 @@ void ContentBrowserClientEfl::OverrideWebkitPrefs(
 void ContentBrowserClientEfl::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
   host->AddFilter(new RenderMessageFilterEfl(host->GetID()));
+#if !defined(EWK_BRINGUP)
   host->AddFilter(new VibrationMessageFilter());
+#endif
   host->AddFilter(new editing::EditorClientObserver(host->GetID()));
 #if defined(OS_TIZEN_MOBILE)
   host->AddFilter(new TtsMessageFilterEfl());

diff --git a/tizen_src/ewk/efl_integration/efl_integration.gypi b/tizen_src/ewk/efl_integration/efl_integration.gypi
index 76e6e25..ebf4765 100644 (file)
--- a/tizen_src/ewk/efl_integration/efl_integration.gypi
+++ b/tizen_src/ewk/efl_integration/efl_integration.gypi
@@ -16,7 +16,7 @@
       'public',
       '<(DEPTH)/third_party/skia/include/core',
       '<(DEPTH)/v8/include',
-      '<(SHARED_INTERMEDIATE_DIR)/webkit/',
+      '<(SHARED_INTERMEDIATE_DIR)/blink/',
     ],
 
     'dependencies': [
@@ -255,10 +255,12 @@
       'browser/selectpicker/popup_menu_item_private.h',
       'browser/selectpicker/popup_menu_item.h',
 
-      'browser/vibration/vibration_provider_client.cc',
-      'browser/vibration/vibration_message_filter.h',
-      'browser/vibration/vibration_message_filter.cc',
-      'browser/vibration/vibration_provider_client.h',
+      # [M41_2272] Temporary removal for switching to new chromium.
+      # FIXME: http://107.108.218.239/bugzilla/show_bug.cgi?id=10491
+      #'browser/vibration/vibration_provider_client.cc',
+      #'browser/vibration/vibration_message_filter.h',
+      #'browser/vibration/vibration_message_filter.cc',
+      #'browser/vibration/vibration_provider_client.h',
 
       'browser/web_cache_efl/web_cache_manager_efl.cc',
       'browser/web_cache_efl/web_cache_manager_efl.h',

diff --git a/tizen_src/ewk/efl_integration/eweb_context.cc b/tizen_src/ewk/efl_integration/eweb_context.cc
index 311cc06..9fd54ee 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_context.cc
+++ b/tizen_src/ewk/efl_integration/eweb_context.cc
@@ -234,7 +234,9 @@ EWebContext::EWebContext(bool incognito)
 }
 
 EWebContext::~EWebContext() {
+#if !defined(EWK_BRINGUP)
   VibrationProviderClient::DeleteInstance();
+#endif
 }
 
 void EWebContext::ClearNetworkCache() {

diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h
index e44a548..1e6a8ce 100644 (file)
--- a/tizen_src/ewk/efl_integration/eweb_view.h
+++ b/tizen_src/ewk/efl_integration/eweb_view.h
@@ -45,8 +45,8 @@
 #include "web_contents_delegate_efl.h"
 #include "context_menu_controller_efl.h"
 #include "file_chooser_controller_efl.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/size.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/size.h"
 #include "browser/inputpicker/InputPicker.h"
 #include "tizen_webview/public/tw_hit_test.h"
 #include "popup_controller_efl.h"

diff --git a/tizen_src/ewk/efl_integration/network_delegate_efl.h b/tizen_src/ewk/efl_integration/network_delegate_efl.h
index e5f1f88..286f0f0 100644 (file)
--- a/tizen_src/ewk/efl_integration/network_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/network_delegate_efl.h
@@ -8,12 +8,12 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "net/base/network_delegate.h"
+#include "net/base/network_delegate_impl.h"
 #include "cookie_manager.h"
 
 namespace net {
 
-class NetworkDelegateEfl : public NetworkDelegate {
+class NetworkDelegateEfl : public NetworkDelegateImpl {
  public:
   NetworkDelegateEfl(scoped_refptr<CookieManager> cookie_manager);
 

diff --git a/tizen_src/ewk/efl_integration/private/ewk_text_style_private.h b/tizen_src/ewk/efl_integration/private/ewk_text_style_private.h
index 3c1225f..069551c 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/ewk_text_style_private.h
+++ b/tizen_src/ewk/efl_integration/private/ewk_text_style_private.h
@@ -11,7 +11,7 @@
 #include <Eina.h>
 #include <Evas.h>
 
-#include <ui/gfx/point.h>
+#include <ui/gfx/geometry/point.h>
 
 struct SelectionColor {
   int r;

diff --git a/tizen_src/ewk/efl_integration/public/ewk_context.cc b/tizen_src/ewk/efl_integration/public/ewk_context.cc
index fddb5ee..a0baeb4 100644 (file)
--- a/tizen_src/ewk/efl_integration/public/ewk_context.cc
+++ b/tizen_src/ewk/efl_integration/public/ewk_context.cc
@@ -451,8 +451,10 @@ void ewk_context_vibration_client_callbacks_set(Ewk_Context* context,
                                                 Ewk_Vibration_Client_Vibration_Cancel_Cb cancel,
                                                 void* data)
 {
+#if !defined(EWK_BRINGUP)
   VibrationProviderClient* vibra_client = VibrationProviderClient::GetInstance();
   vibra_client->SetVibrationClientCallbacks(vibrate, cancel, data);
+#endif
 }
 
 Eina_Bool ewk_context_tizen_extensible_api_string_set(Ewk_Context* ewkContext,  const char* extensibleAPI, Eina_Bool enable)

diff --git a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
index 976572c..ae576ba 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
+++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
@@ -12,6 +12,7 @@
 #include "common/render_messages_ewk.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
+#include "third_party/WebKit/public/web/WebFormElement.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
@@ -96,13 +97,44 @@ void RenderFrameObserverEfl::OnClosePopupMenu() {
 #endif
 
 void RenderFrameObserverEfl::OnMoveNextSelectElement() {
+#if !defined(EWK_BRINGUP)
   content::RenderView* render_view_ = render_frame()->GetRenderView();
   render_view_->GetWebView()->moveSelectElementToNext();
+#endif
 }
 
 void RenderFrameObserverEfl::OnMovePreviousSelectElement() {
+#if !defined(EWK_BRINGUP)
   content::RenderView* render_view_ = render_frame()->GetRenderView();
   render_view_->GetWebView()->moveSelectElementToPrevious();
+#endif
+}
+
+void RenderFrameObserverEfl::DidChangeScrollOffset() {
+  if (render_frame()->GetRenderView()->GetMainRenderFrame() != render_frame())
+    return;
+
+  blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
+
+  if (max_scroll_offset_ != frame->maximumScrollOffset()) {
+    max_scroll_offset_ = frame->maximumScrollOffset();
+    Send(new EwkHostMsg_DidChangeMaxScrollOffset(render_frame()->GetRoutingID(),
+                                                 frame->maximumScrollOffset().width,
+                                                 frame->maximumScrollOffset().height));
+  }
+
+  if (last_scroll_offset_ != frame->scrollOffset()) {
+    last_scroll_offset_ = frame->scrollOffset();
+    Send(new EwkHostMsg_DidChangeScrollOffset(render_frame()->GetRoutingID(),
+                                              frame->scrollOffset().width,
+                                              frame->scrollOffset().height));
+  }
+}
+
+void RenderFrameObserverEfl::WillSubmitForm(
+    const blink::WebFormElement& form) {
+  GURL url(form.action());
+  Send(new EwkHostMsg_FormSubmit(routing_id(),url));
 }
 
 } // namespace content

diff --git a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h
index 1f9317d..720b8af 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h
+++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "content/public/renderer/render_frame_observer.h"
+#include "third_party/WebKit/public/platform/WebSize.h"
 
 namespace blink {
 class WebElement;
@@ -25,6 +26,10 @@ class RenderFrameObserverEfl : public RenderFrameObserver {
   // IPC::Listener implementation.
   bool OnMessageReceived(const IPC::Message& message) override;
 
+  void DidChangeScrollOffset() override;
+
+  void WillSubmitForm(const blink::WebFormElement& form) override;
+
  private:
 #if defined(OS_TIZEN)
   void OnSelectPopupMenuItems(bool canceled,
@@ -34,6 +39,9 @@ class RenderFrameObserverEfl : public RenderFrameObserver {
 
   void OnMovePreviousSelectElement();
   void OnMoveNextSelectElement();
+
+  blink::WebSize max_scroll_offset_;
+  blink::WebSize last_scroll_offset_;
 };
 
 } // namespace content

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 7d9a10c..5df894d 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
@@ -268,26 +268,6 @@ void RenderViewObserverEfl::OnPlainTextGet(int plain_text_get_callback_id)
   Send(new EwkHostMsg_PlainTextGetContents(render_view()->GetRoutingID(), content.utf8(), plain_text_get_callback_id));
 }
 
-void RenderViewObserverEfl::DidChangeScrollOffset(blink::WebLocalFrame* frame)
-{
-  if (!frame || (render_view()->GetWebView()->mainFrame() != frame))
-    return;
-
-  if (max_scroll_offset_ != frame->maximumScrollOffset()) {
-    max_scroll_offset_ = frame->maximumScrollOffset();
-    Send(new EwkHostMsg_DidChangeMaxScrollOffset(render_view()->GetRoutingID(),
-                                                 frame->maximumScrollOffset().width,
-                                                 frame->maximumScrollOffset().height));
-  }
-
-  if(last_scroll_offset_ != frame->scrollOffset()) {
-    last_scroll_offset_ = frame->scrollOffset();
-    Send(new EwkHostMsg_DidChangeScrollOffset(render_view()->GetRoutingID(),
-                                              frame->scrollOffset().width,
-                                              frame->scrollOffset().height));
-  }
-}
-
 void RenderViewObserverEfl::OnGetSelectionStyle()
 {
   blink::WebView* view = render_view()->GetWebView();
@@ -614,17 +594,6 @@ void RenderViewObserverEfl::ScrollToFocusedEditableNode()
   view->scrollFocusedNodeIntoView();
 }
 
-void RenderViewObserverEfl::OrientationChangeEvent()
-{
-  ScrollToFocusedEditableNode();
-}
-
-void RenderViewObserverEfl::WillSubmitForm(blink::WebLocalFrame* frame, const blink::WebFormElement& form)
-{
-  GURL url(form.action());
-  Send(new EwkHostMsg_FormSubmit(routing_id(),url));
-}
-
 void RenderViewObserverEfl::OnSetBrowserFont()
 {
 #if !defined(EWK_BRINGUP)

diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
index 1b7053a..89080d0 100644 (file)
--- a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
+++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
@@ -46,10 +46,8 @@ class RenderViewObserverEfl: public content::RenderViewObserver {
       ContentRendererClientEfl* render_client);
   virtual ~RenderViewObserverEfl();
 
-  void DidChangeScrollOffset(blink::WebLocalFrame* frame) override;
   bool OnMessageReceived(const IPC::Message& message) override;
   virtual void DidCreateDocumentElement(blink::WebLocalFrame* frame) override;
-  void OrientationChangeEvent() override;
 #if !defined(EWK_BRINGUP)
   virtual void DidChangePageScaleFactor() override;
 #endif
@@ -62,8 +60,6 @@ class RenderViewObserverEfl: public content::RenderViewObserver {
   //So using this notification to update minimum and maximum page scale factor values
   virtual void DidUpdateLayout() override;
 
-  void WillSubmitForm(blink::WebLocalFrame* frame, const blink::WebFormElement& form) override;
-
  private:
   void OnSetContentSecurityPolicy(const std::string& policy, Ewk_CSP_Header_Type header_type);
   void OnScale(double scale_factor, int x, int y);
@@ -90,9 +86,6 @@ class RenderViewObserverEfl: public content::RenderViewObserver {
   void OnSetViewMode(blink::WebViewMode view_mode);
 
   void ScrollToFocusedEditableNode();
-
-  blink::WebSize max_scroll_offset_;
-  blink::WebSize last_scroll_offset_;
   float cached_min_page_scale_factor_;
   float cached_max_page_scale_factor_;
   gfx::Size last_sent_contents_size_;

diff --git a/tizen_src/ewk/efl_integration/scroll_detector.h b/tizen_src/ewk/efl_integration/scroll_detector.h
index cb0336c..1f36b1f 100644 (file)
--- a/tizen_src/ewk/efl_integration/scroll_detector.h
+++ b/tizen_src/ewk/efl_integration/scroll_detector.h
@@ -5,7 +5,7 @@
 #ifndef _SCROLL_DETECTOR_H
 #define _SCROLL_DETECTOR_H
 
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 class EWebView;
 

diff --git a/tizen_src/ewk/efl_integration/selection_box_efl.h b/tizen_src/ewk/efl_integration/selection_box_efl.h
index e057462..f155fdf 100644 (file)
--- a/tizen_src/ewk/efl_integration/selection_box_efl.h
+++ b/tizen_src/ewk/efl_integration/selection_box_efl.h
@@ -9,7 +9,7 @@
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/menu_item.h"
 #include "ui/gfx/range/range.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 
 class EWebView;
 

diff --git a/tizen_src/ewk/efl_integration/selection_controller_efl.cc b/tizen_src/ewk/efl_integration/selection_controller_efl.cc
index e18aba8..9b6932b 100644 (file)
--- a/tizen_src/ewk/efl_integration/selection_controller_efl.cc
+++ b/tizen_src/ewk/efl_integration/selection_controller_efl.cc
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "eweb_view.h"
 #include "selection_controller_efl.h"
-#include "selection_box_efl.h"
-#include "selection_magnifier_efl.h"
-#include "ui/gfx/screen.h"
-#include "tizen_webview/public/tw_hit_test.h"
 
 #include <Edje.h>
 
+#include "eweb_view.h"
+#include "tizen_webview/public/tw_hit_test.h"
+
 using namespace tizen_webview;
 
 namespace content {

diff --git a/tizen_src/ewk/efl_integration/selection_controller_efl.h b/tizen_src/ewk/efl_integration/selection_controller_efl.h
index e4243fe..515e07a 100644 (file)
--- a/tizen_src/ewk/efl_integration/selection_controller_efl.h
+++ b/tizen_src/ewk/efl_integration/selection_controller_efl.h
@@ -7,14 +7,13 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
-#include "ui/gfx/range/range.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/rect.h"
 #include "selection_box_efl.h"
 #include "selection_handle_efl.h"
 #include "selection_magnifier_efl.h"
-
+#include "ui/gfx/range/range.h"
+#include "ui/gfx/geometry/rect.h"
 #include "tizen_webview/public/tw_selection_controller.h"
+#include "tizen_webview/public/tw_hit_test.h"
 
 #if defined(OS_TIZEN)
 #include "vconf/vconf.h"

diff --git a/tizen_src/ewk/efl_integration/selection_handle_efl.h b/tizen_src/ewk/efl_integration/selection_handle_efl.h
index 1f32a8a..9a83d33 100644 (file)
--- a/tizen_src/ewk/efl_integration/selection_handle_efl.h
+++ b/tizen_src/ewk/efl_integration/selection_handle_efl.h
@@ -5,7 +5,7 @@
 #ifndef selection_handle_h
 #define selection_handle_h
 
-#include "ui/gfx/point.h"
+#include "ui/gfx/geometry/point.h"
 
 #include <Evas.h>
 

diff --git a/tizen_src/ewk/efl_integration/selection_magnifier_efl.cc b/tizen_src/ewk/efl_integration/selection_magnifier_efl.cc
index 3cf6c14..b2b08a6 100644 (file)
--- a/tizen_src/ewk/efl_integration/selection_magnifier_efl.cc
+++ b/tizen_src/ewk/efl_integration/selection_magnifier_efl.cc
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "selection_magnifier_efl.h"
+
+#include <Elementary.h>
+
 #include "base/path_service.h"
 #include "base/files/file_path.h"
 #include "content/common/paths_efl.h"
 #include "content/public/browser/browser_thread.h"
 #include "eweb_view.h"
-#include "selection_magnifier_efl.h"
 #include "selection_controller_efl.h"
 
-#include <Elementary.h>
-
 namespace content {
 
 // Inherited from WK2 w.r.t tizen style

diff --git a/tizen_src/ewk/efl_integration/selection_magnifier_efl.h b/tizen_src/ewk/efl_integration/selection_magnifier_efl.h
index 6db464e..c1e0563 100644 (file)
--- a/tizen_src/ewk/efl_integration/selection_magnifier_efl.h
+++ b/tizen_src/ewk/efl_integration/selection_magnifier_efl.h
@@ -5,13 +5,13 @@
 #ifndef selection_magnifier_efl_h
 #define selection_magnifier_efl_h
 
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/point.h"
-
 #include <Ecore.h>
 #include <Eina.h>
 #include <Evas.h>
 
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/geometry/point.h"
+
 namespace content {
 
 class SelectionControllerEfl;

diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
index 44e92e7..1be9701 100644 (file)
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
@@ -169,6 +169,7 @@ void WebContentsDelegateEfl::LoadProgressChanged(WebContents* source, double pro
 bool WebContentsDelegateEfl::ShouldCreateWebContents(
     WebContents* web_contents,
     int route_id,
+    int main_frame_route_id,
     WindowContainerType window_container_type,
     const string16& /*frame_name*/,
     const GURL& target_url,

diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
index c98021d..f40131a 100644 (file)
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
@@ -49,6 +49,7 @@ class WebContentsDelegateEfl
   virtual bool ShouldCreateWebContents(
       WebContents*,
       int route_id,
+      int main_frame_route_id,
       WindowContainerType,
       const base::string16& frame_name,
       const GURL& target_url,