From: Kamil Nowac Date: Tue, 18 Oct 2016 07:17:38 +0000 (+0200) Subject: Buildbreak fix for PWA X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a7b8a130cfff94c04a19be4ee1ffa3722dab603;p=profile%2Fcommon%2Fapps%2Fweb%2Fbrowser.git Buildbreak fix for PWA [Issue] N/A [Problem] Build break [Solution] added mutable keyword in lambda, old ewk api usage removed, removed function [Verify] Browser should build with PWA flag Change-Id: I134a8adeb98de269d7aafcfd2752344fabe1d94b --- diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp index 2e8ea174..118bfb3d 100755 --- a/services/SimpleUI/SimpleUI.cpp +++ b/services/SimpleUI/SimpleUI.cpp @@ -199,7 +199,7 @@ int SimpleUI::exec(const std::string& _url, const std::string& _caller) std::string url = _url; m_caller = _caller; m_alreadyOpenedExecURL = false; - m_functionViewPrepare = [url, this] { + m_functionViewPrepare = [url, this]() mutable { if (!m_initialised) { if (m_window.get()) { prepareServices(); @@ -606,9 +606,6 @@ void SimpleUI::connectWebEngineSignals() m_webEngine->setCertificatePem.connect(boost::bind(&services::CertificateContents::saveCertificateInfo, m_certificateContents, _1, _2)); m_webEngine->setWrongCertificatePem.connect(boost::bind(&services::CertificateContents::saveWrongCertificateInfo, m_certificateContents, _1, _2)); m_webEngine->fullscreenModeSet.connect(boost::bind(&WebPageUI::fullscreenModeSet, m_webPageUI.get(), _1)); -#if PWA - m_webEngine->resultDataManifest.connect(boost::bind(&SimpleUI::resultDataManifest, this, _1)); -#endif m_webEngine->confirmationRequest.connect(boost::bind(&SimpleUI::handleConfirmationRequest, this, _1)); m_webEngine->getRotation.connect(boost::bind(&SimpleUI::getRotation, this)); m_webEngine->openFindOnPage.connect(boost::bind(&SimpleUI::showFindOnPageUI, this, _1)); diff --git a/services/WebEngineService/WebView.cpp b/services/WebEngineService/WebView.cpp index e3085925..45a4a32b 100755 --- a/services/WebEngineService/WebView.cpp +++ b/services/WebEngineService/WebView.cpp @@ -671,8 +671,11 @@ void WebView::dataSetManifest(Evas_Object* view, Ewk_View_Request_Manifest* mani const char* icon_src(ewk_manifest_icons_src_get(manifest, 0)); int orientation_type = ewk_manifest_orientation_type_get(manifest); int display_mode = ewk_manifest_web_display_mode_get(manifest); - long theme_color = ewk_manifest_theme_color_get(manifest); - long background_color = ewk_manifest_background_color_get(manifest); + // TODO Due to build break and change in ewk API for now theme_color, + // and background_color have hardcoded value. Sample new api usage is in below lines: + // int rt, gt, bt, at, rb, gb, bb, ab; + long theme_color = 0; //ewk_manifest_theme_color_get(manifest, rt, gt, bt, at); + long background_color = 0; //ewk_manifest_background_color_get(manifest, rb, gb, bb, ab); size_t icon_count = ewk_manifest_icons_count_get(manifest); std::string str_short_name = "";