[M47_2526] Chromium upversion to m47_2526 branch

[platform/framework/web/chromium-efl.git] / tizen_src / ewk / efl_integration / renderer / render_view_observer_efl.cc

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 b7f1ccd..529fe8c 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
@@ -69,8 +69,10 @@ bool GetGRBAValuesFromString(const std::string& input, int* r, int* g, int* b, i
     size_t endPos = input.find(")");
 
     std::string value = input.substr(startPos + 1, endPos - startPos - 1);
-    std::vector<std::string> colorValues;
-    base::SplitString(value, ',', &colorValues);
+    std::vector<std::string> colorValues = base::SplitString(value,
+                                                             ",",
+                                                             base::TRIM_WHITESPACE,
+                                                             base::SPLIT_WANT_ALL);
     if (colorValues.size() == 4 || colorValues.size() == 3) {
       base::StringToInt(colorValues[0], r);
       base::StringToInt(colorValues[1], g);
@@ -112,7 +114,6 @@ void PopulateEwkHitTestData(const blink::WebHitTestResult& web_hit_test, Hit_Tes
   params->context = static_cast<Ewk_Hit_Test_Result_Context>(context);
 
   if (params->mode & EWK_HIT_TEST_MODE_NODE_DATA) {
-    params->nodeData.tagName = web_hit_test.node().nodeName().utf8();
     params->nodeData.nodeValue = web_hit_test.node().nodeValue().utf8();
   }
 
@@ -482,11 +483,11 @@ void RenderViewObserverEfl::OnWebAppIconUrlGet(int callback_id)
       continue;
     }
     std::string rel = elem.getAttribute("rel").utf8();
-    if (LowerCaseEqualsASCII(rel, "apple-touch-icon") ||              // Apple's way
-        LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed")) {
+    if (base::LowerCaseEqualsASCII(rel, "apple-touch-icon") ||              // Apple's way
+        base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed")) {
       appleIconUrl = document.completeURL(elem.getAttribute("href")).string().utf8();
       break;
-    } else if (LowerCaseEqualsASCII(rel, "icon")) {                   // Google's way
+    } else if (base::LowerCaseEqualsASCII(rel, "icon")) {                   // Google's way
       iconUrl = document.completeURL(elem.getAttribute("href")).string().utf8();
     }
   }
@@ -517,9 +518,9 @@ void RenderViewObserverEfl::OnWebAppIconUrlsGet(int callback_id) {
       continue;
     }
     std::string rel = elem.getAttribute("rel").utf8();
-    if (LowerCaseEqualsASCII(rel, "apple-touch-icon") ||              // Apple's way
-        LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed") ||  // same here
-        LowerCaseEqualsASCII(rel, "icon")) {                          // Google's way
+    if (base::LowerCaseEqualsASCII(rel, "apple-touch-icon") ||              // Apple's way
+        base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed") ||  // same here
+        base::LowerCaseEqualsASCII(rel, "icon")) {                          // Google's way
       std::string iconSize = elem.getAttribute("sizes").utf8();
       std::string iconUrl = document.completeURL(elem.getAttribute("href")).string().utf8();
 
@@ -551,10 +552,10 @@ void RenderViewObserverEfl::OnWebAppCapableGet(int callback_id) {
       continue;
 
     std::string name = elem.getAttribute("name").utf8();
-    if (LowerCaseEqualsASCII(name, "apple-mobile-web-app-capable") ||   // Apple's way
-        LowerCaseEqualsASCII(name, "mobile-web-app-capable")) {         // Google's way
+    if (base::LowerCaseEqualsASCII(name, "apple-mobile-web-app-capable") ||   // Apple's way
+        base::LowerCaseEqualsASCII(name, "mobile-web-app-capable")) {         // Google's way
       std::string content = elem.getAttribute("content").utf8();
-      if (LowerCaseEqualsASCII(content, "yes")) {
+      if (base::LowerCaseEqualsASCII(content, "yes")) {
         capable = true;
       }
       break;