Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=741a20ad57cae2e0408440bbcb4dc97f636d1757

commit 741a20ad57cae2e0408440bbcb4dc97f636d1757
Author: Devil505 <devil505li...@gmail.com>
Date:   Mon Aug 15 12:19:33 2011 +0200

chromium-browser-13.0.782.112-3-i686
* updating patches

diff --git a/source/gnome-extra/chromium-browser/FrugalBuild 
b/source/gnome-extra/chromium-browser/FrugalBuild
index 7ba3c0e..3ef659c 100644
--- a/source/gnome-extra/chromium-browser/FrugalBuild
+++ b/source/gnome-extra/chromium-browser/FrugalBuild
@@ -21,8 +21,8 @@ 
source=(http://build.chromium.org/buildbot/official/$_F_archive_name-$pkgver.tar
chromium-master-prefs-path.patch \
$pkgname.desktop $pkgname.sh master_preferences)
sha1sums=('4d0bd8c97a544f317749df9bbab09d53d1cf13d6' \
-          '228d6a6a9d6d1aaa2426e8746668e1aee993fa60' \
-          '96379bcc05c031bbd503546bb17be5131f060c2f' \
+          '3f3a7240473bb7d7e104d1a2b942f54aadd3bc1b' \
+          '673f05684986a6ecaa69c00287eafdef6e9e260e' \
'78ed8913b8a598de6a9e45d206973a846dbe8a51' \
'e06de4aee77b3deb77e3b08ebb175ec02da42ced' \
'efc0502b20a1fda64567090ded1b3f6a02d9d090')
diff --git 
a/source/gnome-extra/chromium-browser/chromium-master-prefs-path.patch 
b/source/gnome-extra/chromium-browser/chromium-master-prefs-path.patch
index 77dee9f..ae3dbc5 100644
--- a/source/gnome-extra/chromium-browser/chromium-master-prefs-path.patch
+++ b/source/gnome-extra/chromium-browser/chromium-master-prefs-path.patch
@@ -1,7 +1,6 @@
-diff -dupr a/src/chrome/browser/first_run.cc b/src/chrome/browser/first_run.cc
---- a/src/chrome/browser/first_run/first_run.cc        2010-03-10 
10:21:33.000000000 -0700
-+++ b/src/chrome/browser/first_run/first_run.cc        2010-03-10 
13:08:12.000000000 -0700
-@@ -92,8 +92,7 @@
+--- chromium-13.0.782.112/chrome/browser/first_run/first_run.cc        
2011-08-06 10:01:51.000000000 +0200
++++ chromium-13.0.782.112new/chrome/browser/first_run/first_run.cc     
2011-08-15 11:49:16.000000000 +0200
+@@ -101,8 +101,7 @@ bool FirstRun::ProcessMasterPreferences(

// The standard location of the master prefs is next to the chrome binary.
FilePath master_prefs;
diff --git 
a/source/gnome-extra/chromium-browser/v8-r8472-crbug-77625-huge-number-of-cpu-wakeups.patch
 
b/source/gnome-extra/chromium-browser/v8-r8472-crbug-77625-huge-number-of-cpu-wakeups.patch
index 51ad954..0f329ed 100644
--- 
a/source/gnome-extra/chromium-browser/v8-r8472-crbug-77625-huge-number-of-cpu-wakeups.patch
+++ 
b/source/gnome-extra/chromium-browser/v8-r8472-crbug-77625-huge-number-of-cpu-wakeups.patch
@@ -1,8 +1,80 @@
-Index: compilation-cache.h
-===================================================================
---- compilation-cache.h        (revision 8471)
-+++ compilation-cache.h        (revision 8472)
-@@ -223,14 +223,6 @@
+diff -dupr chromium-13.0.782.112/v8/src/compilation-cache.cc 
chromium-13.0.782.112new/v8/src/compilation-cache.cc
+--- chromium-13.0.782.112/v8/src/compilation-cache.cc  2011-08-06 
10:24:29.000000000 +0200
++++ chromium-13.0.782.112new/v8/src/compilation-cache.cc       2011-08-15 
11:57:27.000000000 +0200
+@@ -52,8 +52,7 @@ CompilationCache::CompilationCache(Isola
+       eval_global_(isolate, kEvalGlobalGenerations),
+       eval_contextual_(isolate, kEvalContextualGenerations),
+       reg_exp_(isolate, kRegExpGenerations),
+-      enabled_(true),
+-      eager_optimizing_set_(NULL) {
++      enabled_(true) {
+   CompilationSubCache* subcaches[kSubCacheCount] =
+     {&script_, &eval_global_, &eval_contextual_, &reg_exp_};
+   for (int i = 0; i < kSubCacheCount; ++i) {
+@@ -62,10 +61,7 @@ CompilationCache::CompilationCache(Isola
+ }
+
+
+-CompilationCache::~CompilationCache() {
+-  delete eager_optimizing_set_;
+-  eager_optimizing_set_ = NULL;
+-}
++CompilationCache::~CompilationCache() {}
+
+
+ static Handle<CompilationCacheTable> AllocateTable(Isolate* isolate, int 
size) {
+@@ -457,47 +453,6 @@ void CompilationCache::PutRegExp(Handle<
+ }
+
+
+-static bool SourceHashCompare(void* key1, void* key2) {
+-  return key1 == key2;
+-}
+-
+-
+-HashMap* CompilationCache::EagerOptimizingSet() {
+-  if (eager_optimizing_set_ == NULL) {
+-    eager_optimizing_set_ = new HashMap(&SourceHashCompare);
+-  }
+-  return eager_optimizing_set_;
+-}
+-
+-
+-bool CompilationCache::ShouldOptimizeEagerly(Handle<JSFunction> function) {
+-  if (FLAG_opt_eagerly) return true;
+-  uint32_t hash = function->SourceHash();
+-  void* key = reinterpret_cast<void*>(hash);
+-  return EagerOptimizingSet()->Lookup(key, hash, false) != NULL;
+-}
+-
+-
+-void CompilationCache::MarkForEagerOptimizing(Handle<JSFunction> function) {
+-  uint32_t hash = function->SourceHash();
+-  void* key = reinterpret_cast<void*>(hash);
+-  EagerOptimizingSet()->Lookup(key, hash, true);
+-}
+-
+-
+-void CompilationCache::MarkForLazyOptimizing(Handle<JSFunction> function) {
+-  uint32_t hash = function->SourceHash();
+-  void* key = reinterpret_cast<void*>(hash);
+-  EagerOptimizingSet()->Remove(key, hash);
+-}
+-
+-
+-void CompilationCache::ResetEagerOptimizingData() {
+-  HashMap* set = EagerOptimizingSet();
+-  if (set->occupancy() > 0) set->Clear();
+-}
+-
+-
+ void CompilationCache::Clear() {
+   for (int i = 0; i < kSubCacheCount; i++) {
+     subcaches_[i]->Clear();
+diff -dupr chromium-13.0.782.112/v8/src/compilation-cache.h 
chromium-13.0.782.112new/v8/src/compilation-cache.h
+--- chromium-13.0.782.112/v8/src/compilation-cache.h   2011-08-06 
10:24:29.000000000 +0200
++++ chromium-13.0.782.112new/v8/src/compilation-cache.h        2011-08-15 
11:58:25.000000000 +0200
+@@ -223,14 +223,6 @@ class CompilationCache {
JSRegExp::Flags flags,
Handle<FixedArray> data);

@@ -17,7 +89,7 @@ Index: compilation-cache.h
// Clear the cache - also used to initialize the cache at startup.
void Clear();

-@@ -274,8 +266,6 @@
+@@ -274,8 +266,6 @@ class CompilationCache {
// Current enable state of the compilation cache.
bool enabled_;

@@ -26,35 +98,70 @@ Index: compilation-cache.h
friend class Isolate;

DISALLOW_COPY_AND_ASSIGN(CompilationCache);
-Index: objects.cc
-===================================================================
---- objects.cc (revision 8471)
-+++ objects.cc (revision 8472)
-@@ -6287,19 +6287,6 @@
+diff -dupr chromium-13.0.782.112/v8/src/compiler.cc 
chromium-13.0.782.112new/v8/src/compiler.cc
+--- chromium-13.0.782.112/v8/src/compiler.cc   2011-08-06 10:24:29.000000000 
+0200
++++ chromium-13.0.782.112new/v8/src/compiler.cc        2011-08-15 
12:00:35.000000000 +0200
+@@ -109,8 +109,6 @@ void CompilationInfo::DisableOptimizatio
+ void CompilationInfo::AbortOptimization() {
+   Handle<Code> code(shared_info()->code());
+   SetCode(code);
+-  Isolate* isolate = code->GetIsolate();
+-  isolate->compilation_cache()->MarkForLazyOptimizing(closure());
}


--uint32_t JSFunction::SourceHash() {
--  uint32_t hash = 0;
--  Object* script = shared()->script();
--  if (!script->IsUndefined()) {
--    Object* source = Script::cast(script)->source();
--    if (source->IsUndefined()) hash = String::cast(source)->Hash();
--  }
--  hash ^= ComputeIntegerHash(shared()->start_position_and_type());
--  hash += ComputeIntegerHash(shared()->end_position());
--  return hash;
+@@ -656,9 +654,6 @@ bool Compiler::CompileLazy(CompilationIn
+             CompilationInfo optimized(function);
+             optimized.SetOptimizing(AstNode::kNoNumber);
+             return CompileLazy(&optimized);
+-          } else if (isolate->compilation_cache()->ShouldOptimizeEagerly(
+-              function)) {
+-            isolate->runtime_profiler()->OptimizeSoon(*function);
+           }
+         }
+       }
+diff -dupr chromium-13.0.782.112/v8/src/isolate.cc 
chromium-13.0.782.112new/v8/src/isolate.cc
+--- chromium-13.0.782.112/v8/src/isolate.cc    2011-08-06 10:24:29.000000000 
+0200
++++ chromium-13.0.782.112new/v8/src/isolate.cc 2011-08-15 12:01:15.000000000 
+0200
+@@ -1853,11 +1853,6 @@ void Isolate::Exit() {
+ }
+
+
+-void Isolate::ResetEagerOptimizingData() {
+-  compilation_cache_->ResetEagerOptimizingData();
-}
-
-
- bool JSFunction::IsInlineable() {
-   if (IsBuiltin()) return false;
-   SharedFunctionInfo* shared_info = shared();
-Index: runtime-profiler.cc
-===================================================================
---- runtime-profiler.cc        (revision 8471)
-+++ runtime-profiler.cc        (revision 8472)
-@@ -43,32 +43,6 @@
+ #ifdef DEBUG
+ #define ISOLATE_FIELD_OFFSET(type, name, ignored)                       \
+ const intptr_t Isolate::name##_debug_offset_ = OFFSET_OF(Isolate, name##_);
+diff -dupr chromium-13.0.782.112/v8/src/isolate.h 
chromium-13.0.782.112new/v8/src/isolate.h
+--- chromium-13.0.782.112/v8/src/isolate.h     2011-08-06 10:24:29.000000000 
+0200
++++ chromium-13.0.782.112new/v8/src/isolate.h  2011-08-15 12:01:46.000000000 
+0200
+@@ -992,8 +992,6 @@ class Isolate {
+   }
+ #endif
+
+-  void ResetEagerOptimizingData();
+-
+   void SetData(void* data) { embedder_data_ = data; }
+   void* GetData() { return embedder_data_; }
+
+diff -dupr chromium-13.0.782.112/v8/src/runtime.cc 
chromium-13.0.782.112new/v8/src/runtime.cc
+--- chromium-13.0.782.112/v8/src/runtime.cc    2011-08-06 10:24:29.000000000 
+0200
++++ chromium-13.0.782.112new/v8/src/runtime.cc 2011-08-15 12:08:54.000000000 
+0200
+@@ -7526,7 +7526,6 @@ RUNTIME_FUNCTION(MaybeObject*, Runtime_N
+     }
+   }
+
+-  isolate->compilation_cache()->MarkForLazyOptimizing(function);
+   if (type == Deoptimizer::EAGER) {
+     RUNTIME_ASSERT(function->IsOptimized());
+   } else {
+diff -dupr chromium-13.0.782.112/v8/src/runtime-profiler.cc 
chromium-13.0.782.112new/v8/src/runtime-profiler.cc
+--- chromium-13.0.782.112/v8/src/runtime-profiler.cc   2011-08-06 
10:24:29.000000000 +0200
++++ chromium-13.0.782.112new/v8/src/runtime-profiler.cc        2011-08-15 
12:06:39.000000000 +0200
+@@ -43,32 +43,6 @@ namespace v8 {
namespace internal {


@@ -87,7 +194,7 @@ Index: runtime-profiler.cc
// Optimization sampler constants.
static const int kSamplerFrameCount = 2;
static const int kSamplerFrameWeight[kSamplerFrameCount] = { 2, 1 };
-@@ -80,33 +54,10 @@
+@@ -80,33 +54,10 @@ static const int kSamplerThresholdMin =
static const int kSamplerThresholdDelta = 1;

static const int kSamplerThresholdSizeFactorInit = 3;
@@ -121,7 +228,7 @@ Index: runtime-profiler.cc
Atomic32 RuntimeProfiler::state_ = 0;
// TODO(isolates): Create the semaphore lazily and clean it up when no
// longer required.
-@@ -125,16 +76,8 @@
+@@ -125,16 +76,8 @@ RuntimeProfiler::RuntimeProfiler(Isolate
sampler_threshold_(kSamplerThresholdInit),
sampler_threshold_size_factor_(kSamplerThresholdSizeFactorInit),
sampler_ticks_until_threshold_adjustment_(
@@ -135,12 +242,12 @@ Index: runtime-profiler.cc
-  state_counts_[IN_JS_STATE] = 0;
-  STATIC_ASSERT(IN_NON_JS_STATE == 0);
-  memset(state_window_, 0, sizeof(state_window_));
-+          kSamplerTicksBetweenThresholdAdjustment),
++           kSamplerTicksBetweenThresholdAdjustment),
+      sampler_window_position_(0) {
ClearSampleBuffer();
}

-@@ -148,16 +91,13 @@
+@@ -148,16 +91,13 @@ void RuntimeProfiler::GlobalSetup() {
}


@@ -159,7 +266,7 @@ Index: runtime-profiler.cc
PrintF("]\n");
}

-@@ -243,20 +183,6 @@
+@@ -243,20 +183,6 @@ void RuntimeProfiler::AddSample(JSFuncti

void RuntimeProfiler::OptimizeNow() {
HandleScope scope(isolate_);
@@ -180,12 +287,12 @@ Index: runtime-profiler.cc

// Run through the JavaScript frames and collect them. If we already
// have a sample of the function, we mark it for optimizations
-@@ -303,24 +229,9 @@
+@@ -303,24 +229,9 @@ void RuntimeProfiler::OptimizeNow() {
: 1;

int threshold = sampler_threshold_ * threshold_size_factor;
-    int current_js_ratio = NoBarrier_Load(&js_ratio_);
-
+-
-    // Adjust threshold depending on the ratio of time spent
-    // in JS code.
-    if (current_js_ratio < 20) {
@@ -197,7 +304,7 @@ Index: runtime-profiler.cc
-      // frequently used functions.
-      threshold *= 3;
-    }
--
+
if (LookupSample(function) >= threshold) {
-      Optimize(function, false, 0);
-      isolate_->compilation_cache()->MarkForEagerOptimizing(
@@ -206,7 +313,7 @@ Index: runtime-profiler.cc
}
}

-@@ -333,40 +244,8 @@
+@@ -333,40 +244,8 @@ void RuntimeProfiler::OptimizeNow() {
}


@@ -247,7 +354,7 @@ Index: runtime-profiler.cc
isolate_->stack_guard()->RequestRuntimeProfilerTick();
#endif
}
-@@ -424,7 +303,6 @@
+@@ -424,7 +303,6 @@ void RuntimeProfiler::HandleWakeUp(Isola
// to get the right count of active isolates.
NoBarrier_AtomicIncrement(&state_, 1);
semaphore_->Signal();
@@ -255,7 +362,7 @@ Index: runtime-profiler.cc
#endif
}

-@@ -471,15 +349,8 @@
+@@ -471,15 +349,8 @@ void RuntimeProfiler::UpdateSamplesAfter

bool RuntimeProfilerRateLimiter::SuspendIfNecessary() {
#ifdef ENABLE_LOGGING_AND_PROFILING
@@ -273,124 +380,10 @@ Index: runtime-profiler.cc
}
#endif
return false;
-Index: runtime.cc
-===================================================================
---- runtime.cc (revision 8471)
-+++ runtime.cc (revision 8472)
-@@ -7821,7 +7821,6 @@
-     }
-   }
-
--  isolate->compilation_cache()->MarkForLazyOptimizing(function);
-   if (type == Deoptimizer::EAGER) {
-     RUNTIME_ASSERT(function->IsOptimized());
-   } else {
-Index: objects.h
-===================================================================
---- objects.h  (revision 8471)
-+++ objects.h  (revision 8472)
-@@ -4924,9 +4924,6 @@
-   // recompilation.
-   inline bool IsMarkedForLazyRecompilation();
-
--  // Compute a hash code for the source code of this function.
--  uint32_t SourceHash();
--
-   // Check whether or not this function is inlineable.
-   bool IsInlineable();
-
-Index: compilation-cache.cc
-===================================================================
---- compilation-cache.cc       (revision 8471)
-+++ compilation-cache.cc       (revision 8472)
-@@ -52,8 +52,7 @@
-       eval_global_(isolate, kEvalGlobalGenerations),
-       eval_contextual_(isolate, kEvalContextualGenerations),
-       reg_exp_(isolate, kRegExpGenerations),
--      enabled_(true),
--      eager_optimizing_set_(NULL) {
-+      enabled_(true) {
-   CompilationSubCache* subcaches[kSubCacheCount] =
-     {&script_, &eval_global_, &eval_contextual_, &reg_exp_};
-   for (int i = 0; i < kSubCacheCount; ++i) {
-@@ -62,10 +61,7 @@
- }
-
-
--CompilationCache::~CompilationCache() {
--  delete eager_optimizing_set_;
--  eager_optimizing_set_ = NULL;
--}
-+CompilationCache::~CompilationCache() {}
-
-
- static Handle<CompilationCacheTable> AllocateTable(Isolate* isolate, int 
size) {
-@@ -457,47 +453,6 @@
- }
-
-
--static bool SourceHashCompare(void* key1, void* key2) {
--  return key1 == key2;
--}
--
--
--HashMap* CompilationCache::EagerOptimizingSet() {
--  if (eager_optimizing_set_ == NULL) {
--    eager_optimizing_set_ = new HashMap(&SourceHashCompare);
--  }
--  return eager_optimizing_set_;
--}
--
--
--bool CompilationCache::ShouldOptimizeEagerly(Handle<JSFunction> function) {
--  if (FLAG_opt_eagerly) return true;
--  uint32_t hash = function->SourceHash();
--  void* key = reinterpret_cast<void*>(hash);
--  return EagerOptimizingSet()->Lookup(key, hash, false) != NULL;
--}
--
--
--void CompilationCache::MarkForEagerOptimizing(Handle<JSFunction> function) {
--  uint32_t hash = function->SourceHash();
--  void* key = reinterpret_cast<void*>(hash);
--  EagerOptimizingSet()->Lookup(key, hash, true);
--}
--
--
--void CompilationCache::MarkForLazyOptimizing(Handle<JSFunction> function) {
--  uint32_t hash = function->SourceHash();
--  void* key = reinterpret_cast<void*>(hash);
--  EagerOptimizingSet()->Remove(key, hash);
--}
--
--
--void CompilationCache::ResetEagerOptimizingData() {
--  HashMap* set = EagerOptimizingSet();
--  if (set->occupancy() > 0) set->Clear();
--}
--
--
- void CompilationCache::Clear() {
-   for (int i = 0; i < kSubCacheCount; i++) {
-     subcaches_[i]->Clear();
-Index: isolate.h
-===================================================================
---- isolate.h  (revision 8471)
-+++ isolate.h  (revision 8472)
-@@ -978,8 +978,6 @@
-   }
- #endif
-
--  void ResetEagerOptimizingData();
--
-   void SetData(void* data) { embedder_data_ = data; }
-   void* GetData() { return embedder_data_; }
-
-Index: runtime-profiler.h
-===================================================================
---- runtime-profiler.h (revision 8471)
-+++ runtime-profiler.h (revision 8472)
-@@ -37,7 +37,6 @@
+diff -dupr chromium-13.0.782.112/v8/src/runtime-profiler.h 
chromium-13.0.782.112new/v8/src/runtime-profiler.h
+--- chromium-13.0.782.112/v8/src/runtime-profiler.h    2011-08-06 
10:24:29.000000000 +0200
++++ chromium-13.0.782.112new/v8/src/runtime-profiler.h 2011-08-15 
12:08:32.000000000 +0200
+@@ -37,7 +37,6 @@ namespace internal {
class Isolate;
class JSFunction;
class Object;
@@ -398,7 +391,7 @@ Index: runtime-profiler.h
class Semaphore;

class RuntimeProfiler {
-@@ -52,7 +51,6 @@
+@@ -52,7 +51,6 @@ class RuntimeProfiler {
}

void OptimizeNow();
@@ -406,7 +399,7 @@ Index: runtime-profiler.h

void NotifyTick();

-@@ -106,7 +104,7 @@
+@@ -106,7 +104,7 @@ class RuntimeProfiler {

static void HandleWakeUp(Isolate* isolate);

@@ -415,7 +408,7 @@ Index: runtime-profiler.h

void AttemptOnStackReplacement(JSFunction* function);

-@@ -118,31 +116,16 @@
+@@ -118,31 +116,16 @@ class RuntimeProfiler {

void AddSample(JSFunction* function, int weight);

@@ -447,7 +440,7 @@ Index: runtime-profiler.h
// Possible state values:
//   -1            => the profiler thread is waiting on the semaphore
//   0 or positive => the number of isolates running JavaScript code.
-@@ -159,7 +142,7 @@
+@@ -159,7 +142,7 @@ class RuntimeProfiler {
// Rate limiter intended to be used in the profiler thread.
class RuntimeProfilerRateLimiter BASE_EMBEDDED {
public:
@@ -456,7 +449,7 @@ Index: runtime-profiler.h

// Suspends the current thread (which must be the profiler thread)
// when not executing JavaScript to minimize CPU usage. Returns
-@@ -170,8 +153,6 @@
+@@ -170,8 +153,6 @@ class RuntimeProfilerRateLimiter BASE_EM
bool SuspendIfNecessary();

private:
@@ -465,42 +458,3 @@ Index: runtime-profiler.h
DISALLOW_COPY_AND_ASSIGN(RuntimeProfilerRateLimiter);
};

-Index: compiler.cc
-===================================================================
---- compiler.cc        (revision 8471)
-+++ compiler.cc        (revision 8472)
-@@ -109,8 +109,6 @@
- void CompilationInfo::AbortOptimization() {
-   Handle<Code> code(shared_info()->code());
-   SetCode(code);
--  Isolate* isolate = code->GetIsolate();
--  isolate->compilation_cache()->MarkForLazyOptimizing(closure());
- }
-
-
-@@ -660,9 +658,6 @@
-             CompilationInfo optimized(function);
-             optimized.SetOptimizing(AstNode::kNoNumber);
-             return CompileLazy(&optimized);
--          } else if (isolate->compilation_cache()->ShouldOptimizeEagerly(
--              function)) {
--            isolate->runtime_profiler()->OptimizeSoon(*function);
-           }
-         }
-       }
-Index: isolate.cc
-===================================================================
---- isolate.cc (revision 8471)
-+++ isolate.cc (revision 8472)
-@@ -1855,11 +1855,6 @@
- }
-
-
--void Isolate::ResetEagerOptimizingData() {
--  compilation_cache_->ResetEagerOptimizingData();
--}
--
--
- #ifdef DEBUG
- #define ISOLATE_FIELD_OFFSET(type, name, ignored)                       \
- const intptr_t Isolate::name##_debug_offset_ = OFFSET_OF(Isolate, name##_);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to