Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / extensions / common / user_script.cc

diff --git a/src/extensions/common/user_script.cc b/src/extensions/common/user_script.cc
index 193a113..a56cadb 100644 (file)
--- a/src/extensions/common/user_script.cc
+++ b/src/extensions/common/user_script.cc
@@ -155,7 +155,7 @@ void UserScript::Pickle(::Pickle* pickle) const {
 
 void UserScript::PickleGlobs(::Pickle* pickle,
                              const std::vector<std::string>& globs) const {
-  pickle->WriteUInt64(globs.size());
+  pickle->WriteSizeT(globs.size());
   for (std::vector<std::string>::const_iterator glob = globs.begin();
        glob != globs.end(); ++glob) {
     pickle->WriteString(*glob);
@@ -164,7 +164,7 @@ void UserScript::PickleGlobs(::Pickle* pickle,
 
 void UserScript::PickleURLPatternSet(::Pickle* pickle,
                                      const URLPatternSet& pattern_list) const {
-  pickle->WriteUInt64(pattern_list.patterns().size());
+  pickle->WriteSizeT(pattern_list.patterns().size());
   for (URLPatternSet::const_iterator pattern = pattern_list.begin();
        pattern != pattern_list.end(); ++pattern) {
     pickle->WriteInt(pattern->valid_schemes());
@@ -174,7 +174,7 @@ void UserScript::PickleURLPatternSet(::Pickle* pickle,
 
 void UserScript::PickleScripts(::Pickle* pickle,
                                const FileList& scripts) const {
-  pickle->WriteUInt64(scripts.size());
+  pickle->WriteSizeT(scripts.size());
   for (FileList::const_iterator file = scripts.begin();
        file != scripts.end(); ++file) {
     file->Pickle(pickle);
@@ -205,10 +205,10 @@ void UserScript::Unpickle(const ::Pickle& pickle, PickleIterator* iter) {
 
 void UserScript::UnpickleGlobs(const ::Pickle& pickle, PickleIterator* iter,
                                std::vector<std::string>* globs) {
-  uint64 num_globs = 0;
-  CHECK(pickle.ReadUInt64(iter, &num_globs));
+  size_t num_globs = 0;
+  CHECK(pickle.ReadSizeT(iter, &num_globs));
   globs->clear();
-  for (uint64 i = 0; i < num_globs; ++i) {
+  for (size_t i = 0; i < num_globs; ++i) {
     std::string glob;
     CHECK(pickle.ReadString(iter, &glob));
     globs->push_back(glob);
@@ -218,11 +218,11 @@ void UserScript::UnpickleGlobs(const ::Pickle& pickle, PickleIterator* iter,
 void UserScript::UnpickleURLPatternSet(const ::Pickle& pickle,
                                        PickleIterator* iter,
                                        URLPatternSet* pattern_list) {
-  uint64 num_patterns = 0;
-  CHECK(pickle.ReadUInt64(iter, &num_patterns));
+  size_t num_patterns = 0;
+  CHECK(pickle.ReadSizeT(iter, &num_patterns));
 
   pattern_list->ClearPatterns();
-  for (uint64 i = 0; i < num_patterns; ++i) {
+  for (size_t i = 0; i < num_patterns; ++i) {
     int valid_schemes;
     CHECK(pickle.ReadInt(iter, &valid_schemes));
 
@@ -241,10 +241,10 @@ void UserScript::UnpickleURLPatternSet(const ::Pickle& pickle,
 
 void UserScript::UnpickleScripts(const ::Pickle& pickle, PickleIterator* iter,
                                  FileList* scripts) {
-  uint64 num_files = 0;
-  CHECK(pickle.ReadUInt64(iter, &num_files));
+  size_t num_files = 0;
+  CHECK(pickle.ReadSizeT(iter, &num_files));
   scripts->clear();
-  for (uint64 i = 0; i < num_files; ++i) {
+  for (size_t i = 0; i < num_files; ++i) {
     File file;
     file.Unpickle(pickle, iter);
     scripts->push_back(file);