From: Chandan Padhi <c.padhi@samsung.com>
Date: Thu, 22 Sep 2016 09:25:17 +0000 (+0530)
Subject: Remove temporary patch for gpu_control_list.cc
X-Git-Tag: submit/tizen/20201118.160233~293
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5f654bf44d758465eb64ea5ae40f307a2080ba0;p=platform%2Fframework%2Fweb%2Fchromium-efl.git

Remove temporary patch for gpu_control_list.cc

std::find() in gpu_control_list.cc caused build errors for
mobile and tv profiles. This temporary patch was added to
avoid the build error. The build error has been fixed in [1].

[1] http://165.213.202.130/gerrit/#/c/139091

Bug: http://suprem.sec.samsung.net/jira/browse/TWF-2058

Reviewed by: dhyuna.ko, mohan.reddy, sm.venugopal, sns.park

Change-Id: I531a62ba3c2caab984ab6964ef3186927ff79799
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
---

diff --git a/tizen_src/build/patches/hotfix_m53_2785_gpu_control_list.diff b/tizen_src/build/patches/hotfix_m53_2785_gpu_control_list.diff
deleted file mode 100644
index 0ea0fc0..0000000
--- a/tizen_src/build/patches/hotfix_m53_2785_gpu_control_list.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
-index 5561d32..7524e98 100644
---- a/gpu/config/gpu_control_list.cc
-+++ b/gpu/config/gpu_control_list.cc
-@@ -1034,8 +1034,14 @@ bool GpuControlList::GpuControlListEntry::SetFeatures(
-     if (supports_feature_type_all && feature_strings[i] == "all") {
-       for (FeatureMap::const_iterator iter = feature_map.begin();
-            iter != feature_map.end(); ++iter) {
-+#if !defined(EWK_BRINGUP)
-+// [M53_2785] Temporary disabling the codes for swiching to new chromium
-+//            The codes makes a build problem in mobile and tv target.
-+//            It will be fixed by rendering team.
-+//            FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-2058
-         if (std::find(exception_strings.begin(), exception_strings.end(),
-                       iter->first) == exception_strings.end())
-+#endif  // EWK_BRINGUP
-           features_.insert(iter->second);
-       }
-       continue;
-@@ -1044,8 +1050,14 @@ bool GpuControlList::GpuControlListEntry::SetFeatures(
-       features_.clear();
-       return false;
-     }
-+#if !defined(EWK_BRINGUP)
-+// [M53_2785] Temporary disabling the codes for swiching to new chromium
-+//            The codes makes a build problem in mobile and tv target.
-+//            It will be fixed by rendering team.
-+//            FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-2058
-     if (std::find(exception_strings.begin(), exception_strings.end(),
-                   feature_strings[i]) == exception_strings.end())
-+#endif  // EWK_BRINGUP
-       features_.insert(feature);
-   }
-   return true;