From: Youngsoo Choi Date: Tue, 30 Jan 2018 08:09:52 +0000 (+0900) Subject: [hotfix] Add chromium-efl headers X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F168709%2F4;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git [hotfix] Add chromium-efl headers The chromium-efl has been rebased with the latest code. So, this updates corresponding chromium-efl headers because the electron-efl has referred to them in its own source tree. Note that this will be moved to chromium-efl devel package. Change-Id: Ic23291b04a08c3189917a92decb46d516fe64c66 Signed-off-by: Youngsoo Choi --- diff --git a/vendor/brightray/vendor/libchromiumcontent/src/base/base_switches.h b/vendor/brightray/vendor/libchromiumcontent/src/base/base_switches.h index 5fd572a..6caf868 100644 --- a/vendor/brightray/vendor/libchromiumcontent/src/base/base_switches.h +++ b/vendor/brightray/vendor/libchromiumcontent/src/base/base_switches.h @@ -45,6 +45,11 @@ extern const char kEnableLimitWebDiscardableMemory[]; extern const char kDisableLimitWebDiscardableMemory[]; #endif +#if defined(ENABLE_STRING_COMPRESSION) +extern const char kEnableStringCompression[]; +extern const char kDisableStringCompression[]; +#endif + #if defined(OS_POSIX) extern const char kEnableCrashReporterForTesting[]; #endif diff --git a/vendor/brightray/vendor/libchromiumcontent/src/base/files/file_util.h b/vendor/brightray/vendor/libchromiumcontent/src/base/files/file_util.h index b2ebfe9..77a87e7 100644 --- a/vendor/brightray/vendor/libchromiumcontent/src/base/files/file_util.h +++ b/vendor/brightray/vendor/libchromiumcontent/src/base/files/file_util.h @@ -361,12 +361,6 @@ BASE_EXPORT int GetUniquePathNumber(const FilePath& path, BASE_EXPORT bool SetNonBlocking(int fd); #if defined(OS_POSIX) - -// Sets the given |fd| to blocking mode. -// Returns true if it was able to set it in the blocking mode, otherwise -// false. -BASE_EXPORT bool SetBlocking(int fd); - // Creates a non-blocking, close-on-exec pipe. // This creates a non-blocking pipe that is not intended to be shared with any // child process. This will be done atomically if the operating system supports diff --git a/vendor/brightray/vendor/libchromiumcontent/src/base/memory/discardable_shared_memory.h b/vendor/brightray/vendor/libchromiumcontent/src/base/memory/discardable_shared_memory.h index b391ef1..aaabf41 100644 --- a/vendor/brightray/vendor/libchromiumcontent/src/base/memory/discardable_shared_memory.h +++ b/vendor/brightray/vendor/libchromiumcontent/src/base/memory/discardable_shared_memory.h @@ -133,6 +133,9 @@ class BASE_EXPORT DiscardableSharedMemory { return shared_memory_.ShareToProcess(process_handle, new_handle); } + // Returns the locked page count for DiscardableSharedMemory object. + size_t locked_page_count() const { return locked_page_count_; } + private: // Virtual for tests. virtual Time Now() const; diff --git a/vendor/brightray/vendor/libchromiumcontent/src/base/nacl_logging.h b/vendor/brightray/vendor/libchromiumcontent/src/base/nacl_logging.h index a80edee..c325090 100644 --- a/vendor/brightray/vendor/libchromiumcontent/src/base/nacl_logging.h +++ b/vendor/brightray/vendor/libchromiumcontent/src/base/nacl_logging.h @@ -12,6 +12,7 @@ namespace logging { #if !defined(OS_NACL) +void SetNaClLoggingEnabled(bool enabled); void InitializeNaClLogging(NaClApp* nap); #elif !defined(OS_NACL_NONSFI) bool NaClLogMessageHandler(int severity, const std::string&); diff --git a/vendor/brightray/vendor/libchromiumcontent/src/base/path_service.h b/vendor/brightray/vendor/libchromiumcontent/src/base/path_service.h index 184bd5b..87b095a 100644 --- a/vendor/brightray/vendor/libchromiumcontent/src/base/path_service.h +++ b/vendor/brightray/vendor/libchromiumcontent/src/base/path_service.h @@ -79,10 +79,8 @@ class BASE_EXPORT PathService { // Disable internal cache. static void DisableCache(); -#if defined(OS_TIZEN_TV_PRODUCT) // Clear all cached paths. static void Clear(); -#endif private: friend class ScopedPathOverride; diff --git a/vendor/brightray/vendor/libchromiumcontent/src/base/time/time.h b/vendor/brightray/vendor/libchromiumcontent/src/base/time/time.h index cd31244..1bacd5e 100644 --- a/vendor/brightray/vendor/libchromiumcontent/src/base/time/time.h +++ b/vendor/brightray/vendor/libchromiumcontent/src/base/time/time.h @@ -623,10 +623,12 @@ class BASE_EXPORT Time : public time_internal::TimeBase