Remove tab ID checker

Tab ID checker is called after URI is changed.
If a tab with URI chanage is not the current tab,
it changes the current tab to a tab with URI change.
This may cause unwanted tab switching
when some backgound tabs change its URI for some reason.

Change-Id: I6e8583f0952dc961a5a4d148c9e79bb25d536ac1
Signed-off-by: sungwon2han <sungwon2.han@samsung.com>

diff --git a/core/AbstractWebEngine/AbstractWebEngine.h b/core/AbstractWebEngine/AbstractWebEngine.h
index 39c23c7..91da16c 100644 (file)
--- a/core/AbstractWebEngine/AbstractWebEngine.h
+++ b/core/AbstractWebEngine/AbstractWebEngine.h
@@ -340,11 +340,6 @@ public:
     boost::signals2::signal<void (const std::string &)> uriChanged;
 
     /**
-     * URI on current/other page changed
-     */
-    boost::signals2::signal<void (TabId)> uriOnTabChanged;
-
-    /**
      * Possibility of go forward changed
      * \param bool true if it is possible to go forward, false otherwise
      */

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 68a4215..f3b6504 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -396,7 +396,6 @@ void SimpleUI::connectModelSignals()
     m_webEngine->uriChanged.connect(boost::bind(&SimpleUI::webEngineURLChanged, this, _1));
     m_webEngine->uriChanged.connect(boost::bind(&URIEntry::changeUri, &m_webPageUI->getURIEntry(), _1));
     m_webEngine->uriChanged.connect(boost::bind(&MoreMenuUI::setURL, m_moreMenuUI.get(), _1));
-    m_webEngine->uriOnTabChanged.connect(boost::bind(&SimpleUI::checkTabId,this,_1));
     m_webEngine->webViewClicked.connect(boost::bind(&URIEntry::clearFocus, &m_webPageUI->getURIEntry()));
     m_webEngine->backwardEnableChanged.connect(boost::bind(&WebPageUI::setBackButtonEnabled, m_webPageUI.get(), _1));
     m_webEngine->forwardEnableChanged.connect(boost::bind(&WebPageUI::setForwardButtonEnabled, m_webPageUI.get(), _1));
@@ -502,14 +501,6 @@ void SimpleUI::switchViewToIncognitoPage()
     m_viewManager->popStackTo(m_webPageUI.get());
 }
 
-void SimpleUI::checkTabId(const tizen_browser::basic_webengine::TabId& id){
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(m_webEngine->currentTabId() != id || isErrorPageActive()){
-        BROWSER_LOGD("URL changed on non-visible tab, updating browser view");
-        switchToTab(id);
-    }
-}
-
 void SimpleUI::openNewTab(const std::string &uri, bool desktopMode)
 {
     BROWSER_LOGD("[%s:%d] uri =%s", __PRETTY_FUNCTION__, __LINE__, uri.c_str());

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index 91d03fe..4a2293b 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -162,12 +162,6 @@ private:
     void onURLEntryEdited();
 
     /**
-     * Checks if correct tab is visible to user, and if not, it update browser view
-     * @param id of tab that should be visible to user
-     */
-    void checkTabId(const tizen_browser::basic_webengine::TabId& id);
-
-    /**
      * \brief check if url comming back from WebEngine should be passed to URI.
      *
      * For filtered addresses we need to hide real URI so the user would be confused.

diff --git a/services/WebKitEngineService/WebKitEngineService.cpp b/services/WebKitEngineService/WebKitEngineService.cpp
index 0841342..53beb2e 100644 (file)
--- a/services/WebKitEngineService/WebKitEngineService.cpp
+++ b/services/WebKitEngineService/WebKitEngineService.cpp
@@ -223,12 +223,6 @@ void WebKitEngineService::_uriChanged(const std::string & uri)
     uriChanged(uri);
 }
 
-void WebKitEngineService::_uriChangedOnTab(TabId id)
-{
-    BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-    uriOnTabChanged(id);
-}
-
 void WebKitEngineService::_loadFinished()
 {
     loadFinished();
@@ -325,7 +319,6 @@ TabId WebKitEngineService::addTab(const std::string & uri, const TabId * openerI
     if (!uri.empty()) {
         p->setURI(uri);
     }
-    p->tabIdChecker.connect(boost::bind(&WebKitEngineService::_uriChangedOnTab,this,_1));
 
     switchToTab(newTabId);
     AbstractWebEngine::tabCreated();

diff --git a/services/WebKitEngineService/WebKitEngineService.h b/services/WebKitEngineService/WebKitEngineService.h
index be37eac..a85bac2 100644 (file)
--- a/services/WebKitEngineService/WebKitEngineService.h
+++ b/services/WebKitEngineService/WebKitEngineService.h
@@ -186,7 +186,6 @@ private:
     void _favIconChanged(std::shared_ptr<tizen_browser::tools::BrowserImage> bi);
     void _titleChanged(const std::string &);
     void _uriChanged(const std::string &);
-    void _uriChangedOnTab(TabId);
     void _loadFinished();
     void _loadStarted();
     void _loadStop();

diff --git a/services/WebKitEngineService/WebView.cpp b/services/WebKitEngineService/WebView.cpp
index d8a1603..9a2a091 100644 (file)
--- a/services/WebKitEngineService/WebView.cpp
+++ b/services/WebKitEngineService/WebView.cpp
@@ -642,7 +642,6 @@ void WebView::__urlChanged(void * data, Evas_Object * /* obj */, void * /* event
     WebView * self = reinterpret_cast<WebView *>(data);
     BROWSER_LOGD("URL changed for tab: %s", self->getTabId().toString().c_str());
     self->uriChanged(self->getURI());
-    self->tabIdChecker(self->m_tabId);
 }
 
 void WebView::__backForwardListChanged(void * data, Evas_Object * /* obj */, void * /* event_info */)

diff --git a/services/WebKitEngineService/WebView.h b/services/WebKitEngineService/WebView.h
index 2243c19..f6aa423 100644 (file)
--- a/services/WebKitEngineService/WebView.h
+++ b/services/WebKitEngineService/WebView.h
@@ -159,7 +159,6 @@ public:
     boost::signals2::signal<void (std::shared_ptr<tizen_browser::tools::BrowserImage>)> favIconChanged;
     boost::signals2::signal<void (const std::string &)> titleChanged;
     boost::signals2::signal<void (const std::string)> uriChanged;
-    boost::signals2::signal<void (TabId)> tabIdChecker;
 
     boost::signals2::signal<void ()> loadFinished;
     boost::signals2::signal<void ()> loadStarted;