Merge branch 'tizen_4.0' into tizen_5.0

Change-Id: I1006e7daf1ab5f3375dbb9c39c945cc6ea69365b

diff --cc packaging/webapi-plugins.spec
index c7f13a046f06475e629a562575aeec32da48ae9d,445821f31ff0b7e184d20a20eee16ce5a22dfaab..76b78844e853cf3fd9a3c4cc53dca5a9e028f5f6
--- 1/packaging/webapi-plugins.spec
--- 2/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 90f7a5c8c0970e6b520c34903bf57f4c804dd8e3,c54ccd4f8e7035d8e7f07481d910c8e1a825b591..83f18c9a77f27669855a0a1f0dbcb3d89b7ba1f9
--- 1/src/utils/utils_api.js
--- 2/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) {
-       xwalk.utils.error('Invalid JSON received: ' + json);
 +      // 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('Ignoring message - Invalid JSON received: ' + json);
        return;
      }
      var id;