From: Piotr Kosko/Native/Web API (SWP) /SRPOL/Professional/삼성전자 <p.kosko@samsung.com>
Date: Tue, 20 Nov 2018 08:36:20 +0000 (+0100)
Subject: Merge branch 'tizen_4.0' into tizen_5.0
X-Git-Tag: submit/tizen_5.0/20181126.103411~7^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ca2f3503725984abf53172e3ce5fb2c4b33245c;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_4.0' into tizen_5.0

Change-Id: I1006e7daf1ab5f3375dbb9c39c945cc6ea69365b
---

2ca2f3503725984abf53172e3ce5fb2c4b33245c
diff --cc packaging/webapi-plugins.spec
index c7f13a04,445821f3..76b78844
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -8,7 -8,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
- Version:    2.33
 -Version:    2.29
++Version:    2.34
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries
diff --cc src/utils/utils_api.js
index 90f7a5c8,c54ccd4f..83f18c9a
--- a/src/utils/utils_api.js
+++ b/src/utils/utils_api.js
@@@ -1029,17 -1029,7 +1029,17 @@@ var NativeManager = function(extension
      try {
        var msg = JSON_.parse(json);
      } catch (error) {
 +      // Because of special handling of power lock in chromium, the special signals:
 +      // - __DisableChromiumInternalPowerLock
 +      // - __EnableChromiumInternalPowerLock
 +      // could occur. In such cases we are silently ignroing those messages.
 +      // TODO This is workaround for missing patch in chromium-efl package which should handle
 +      // this special message and don't forward it to webapi JS. After chromium-efl will
 +      // be updated, below checking should be removed.
 +      if (json.substring(0,2) === '__') {
 +        return;
 +      }
-       xwalk.utils.error('Invalid JSON received: ' + json);
+       xwalk.utils.error('Ignoring message - Invalid JSON received: ' + json);
        return;
      }
      var id;