Fix the coding rule and Svace Issue 75/129775/4
authorHyeKyoung Hwang <cookie@samsung.com>
Thu, 18 May 2017 05:39:47 +0000 (14:39 +0900)
committerHye Kyoung Hwang <cookie@samsung.com>
Mon, 22 May 2017 01:09:40 +0000 (01:09 +0000)
Change-Id: Ie90d8849dfb796e78cb1a4a393ba1cb7bfa25d90
Signed-off-by: HyeKyoung Hwang <cookie@samsung.com>
services/WebEngineService/WebView.cpp

index e4efb4d8e829dd9156784791dadbfb9bd9402528..3e7790e566f59df2ad3db00396f0ca8dd4f25a8e 100755 (executable)
@@ -648,11 +648,9 @@ void WebView::confirmationResult(WebConfirmationPtr confirmation)
 
         if (cert->getResult() == WebConfirmation::ConfirmationResult::Confirmed) {
             result = EINA_TRUE;
-        }
-        else if (cert->getResult() == WebConfirmation::ConfirmationResult::Rejected) {
+        } else if (cert->getResult() == WebConfirmation::ConfirmationResult::Rejected) {
             result = EINA_FALSE;
-        }
-        else {
+        } else {
             BROWSER_LOGE("Wrong ConfirmationResult");
             return;
         }
@@ -697,8 +695,7 @@ tools::BrowserImagePtr WebView::captureSnapshot(int targetWidth, int targetHeigh
         area.y = 0;
         area.w = vh*getZoomFactor()*snapshotProportions;
         area.h = vh*getZoomFactor();
-    }
-    else {
+    } else {
         area.x = 0;
         area.y = 0;
         area.w = vw*getZoomFactor();
@@ -707,15 +704,17 @@ tools::BrowserImagePtr WebView::captureSnapshot(int targetWidth, int targetHeigh
     if (area.w == 0 || area.h == 0)
         return std::make_shared<BrowserImage>();
 
-    BROWSER_LOGD("[%s:%d] Before snapshot (screenshot) - look at the time of taking snapshot below",__func__, __LINE__);
+    BROWSER_LOGD("[%s:%d] Before snapshot (screenshot) - look at the time of taking snapshot below", __func__, __LINE__);
 
     if (async) {
         SnapshotItemData *snapshot_data = new SnapshotItemData();
-        snapshot_data->web_view = this;
-        snapshot_data->snapshot_type = snapshot_type;
-        bool result = ewk_view_screenshot_contents_get_async(m_ewkView, area, scale, evas_object_evas_get(m_ewkView), __screenshotCaptured, snapshot_data);
-        if (!result)
-            BROWSER_LOGD("[%s:%d] ewk_view_screenshot_contents_get_async API failed", __func__, __LINE__);
+        if (snapshot_data) {
+            snapshot_data->web_view = this;
+            snapshot_data->snapshot_type = snapshot_type;
+            bool result = ewk_view_screenshot_contents_get_async(m_ewkView, area, scale, evas_object_evas_get(m_ewkView), __screenshotCaptured, snapshot_data);
+            if (!result)
+                BROWSER_LOGD("[%s:%d] ewk_view_screenshot_contents_get_async API failed", __func__, __LINE__);
+        }
     } else {
         Evas_Object *snapshot = ewk_view_screenshot_contents_get(m_ewkView, area, scale, evas_object_evas_get(m_ewkView));
         BROWSER_LOGD("[%s:%d] Snapshot (screenshot) catched, evas pointer: %p", __func__, __LINE__, snapshot);
@@ -744,7 +743,7 @@ void WebView::__newWindowRequest(void *data, Evas_Object *, void *out)
     std::shared_ptr<basic_webengine::AbstractWebEngine>  m_webEngine;
     m_webEngine = std::dynamic_pointer_cast
     <
-        basic_webengine::AbstractWebEngine,tizen_browser::core::AbstractService
+        basic_webengine::AbstractWebEngine, tizen_browser::core::AbstractService
     >
     (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.webengineservice", "libWebEngineService.so"));
     M_ASSERT(m_webEngine);
@@ -773,7 +772,7 @@ void WebView::__closeWindowRequest(void *data, Evas_Object *, void *)
     WebView * self = reinterpret_cast<WebView *>(data);
     std::shared_ptr<AbstractWebEngine> m_webEngine =
                 std::dynamic_pointer_cast
-                <basic_webengine::AbstractWebEngine,tizen_browser::core::AbstractService>
+                <basic_webengine::AbstractWebEngine, tizen_browser::core::AbstractService>
                 (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.webengineservice", "libWebEngineService.so"));
     m_webEngine->closeTab(self->getTabId());
 }
@@ -810,8 +809,8 @@ void WebView::__setManifestData(Evas_Object *view, Ewk_View_Request_Manifest *ma
             self->m_manifestData.icons.clear();
             for (size_t iconNumber = 0; iconNumber < self->m_manifestData.icons_count; iconNumber++) {
                 ManifestData::_icon icon;
-                icon.src = (( tmp = ewk_manifest_icons_src_get(manifest, iconNumber)) ? tmp : "");
-                icon.type = (( tmp = ewk_manifest_icons_type_get(manifest, iconNumber)) ? tmp : "");
+                icon.src = ((tmp = ewk_manifest_icons_src_get(manifest, iconNumber)) ? tmp : "");
+                icon.type = ((tmp = ewk_manifest_icons_type_get(manifest, iconNumber)) ? tmp : "");
                 icon.sizes_count = ewk_manifest_icons_sizes_count_get(manifest, iconNumber);
                 for (size_t sizeNumber = 0; sizeNumber < icon.sizes_count; sizeNumber++) {
                     ManifestData::_icon::_size size;
@@ -901,8 +900,7 @@ void WebView::__loadError(void* data, Evas_Object * obj, void* ewkError)
         BROWSER_LOGD("Stop signal emitted");
         BROWSER_LOGD("Error description: %s", ewk_error_description_get(error));
         evas_object_smart_callback_call(obj, "load,stop", nullptr);
-    }
-    else {
+    } else {
         self->loadError();
         self->m_loadError = true;
     }
@@ -951,8 +949,7 @@ void WebView::__backForwardListChanged(void * data, Evas_Object * /* obj */, voi
 
 void WebView::__faviconChanged(void* data, Evas_Object*, void*)
 {
-    if(data)
-    {
+    if (data) {
         WebView * self = static_cast<WebView *>(data);
         Evas_Object * favicon = ewk_context_icon_database_icon_object_add(self->m_ewkContext, ewk_view_url_get(self->m_ewkView), evas_object_evas_get(self->m_ewkView));
         if (favicon) {
@@ -1093,7 +1090,7 @@ context_menu_type WebView::_get_menu_type(Ewk_Context_Menu *menu)
         return TEXT_LINK;
     if (image && !link)
         return IMAGE_ONLY;
-    if(selection_mode && image && link)
+    if (selection_mode && image && link)
         return TEXT_IMAGE_LINK;
     if (image && link)
         return IMAGE_LINK;
@@ -1113,7 +1110,7 @@ void WebView::_show_context_menu_text_link(Ewk_Context_Menu *menu)
     }
 
     /* Open in new window */
-    ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW,_("IDS_BR_OPT_OPEN_IN_NEW_WINDOW_ABB"), true);   //TODO: missing translation
+    ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW, _("IDS_BR_OPT_OPEN_IN_NEW_WINDOW_ABB"), true);   //TODO: missing translation
     /* Save link */
     ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_DOWNLOAD_LINK_TO_DISK, _("IDS_BR_BODY_SAVE_LINK"), true);
     /* Copy link address */
@@ -1228,7 +1225,7 @@ void WebView::_show_context_menu_text_image_link(Ewk_Context_Menu *menu)
     }
 
     /* Open in new window */
-    ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW,_("IDS_BR_OPT_OPEN_IN_NEW_WINDOW_ABB"), true);      //TODO: missing translation
+    ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW, _("IDS_BR_OPT_OPEN_IN_NEW_WINDOW_ABB"), true);     //TODO: missing translation
     /* Save link */
     ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_DOWNLOAD_LINK_TO_DISK, _("IDS_BR_OPT_SAVE_LINK"), true);
     /* Copy link address */
@@ -1384,8 +1381,9 @@ void WebView::__rotate_prepared_cb(void * data, Evas_Object *, void *)
     if (data) {
         auto *self = static_cast<WebView *>(data);
         self->rotatePrepared();
-    } else
+    } else {
         BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);
+    }
 }
 
 void WebView::__top_controls_moved_cb(void* data, Evas_Object*, void* event_info)
@@ -1481,7 +1479,7 @@ bool WebView::hasFocus() const
 
 double WebView::getZoomFactor() const
 {
-    if(EINA_UNLIKELY(m_ewkView == nullptr)) {
+    if (EINA_UNLIKELY(m_ewkView == nullptr)) {
         return 1.0;
     }
 
@@ -1636,8 +1634,9 @@ void WebView::clearFormData()
     M_ASSERT(m_ewkContext);
     if (m_ewkContext) {
         ewk_context_form_candidate_data_delete_all(m_ewkContext);
-    } else
+    } else {
         BROWSER_LOGD("[%s:%d] Warning: no context", __PRETTY_FUNCTION__, __LINE__);
+    }
 }
 
 void WebView::searchOnWebsite(const std::string & searchString, int flags)