[meego-commits] 6052: Changes to Trunk/chromium

[Peter Zhu]

Hi,
I have made the following changes to chromium in project Trunk. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #6052:

  submit:   Trunk:Testing/chromium(r19) -> Trunk/chromium


Message:
    Move to Trunk

State:   new          2010-07-28T02:35:56 peter
Comment: None



changes files:
--------------
--- chromium.changes
+++ chromium.changes
@@ -0,0 +1,3 @@
+* Wed July 28 Wei James <james.wei at intel.com> - 6.0.417.0
+- Fix tcmalloc gcc 4.5 issue for BMC#4045
+

new:
----
  tcmalloc-fix.patch

spec files:
-----------
--- chromium.spec
+++ chromium.spec
@@ -106,6 +106,10 @@
 # Fix gcc4.5 NULL converstion errors
 Patch28:		chromium-fix-gcc-4.5-build-errors.patch
 
+# Fix tcmalloc gcc 4.5
+Patch29:		tcmalloc-fix.patch
+
+
 ########### patches to re-org the visibility options in Chromium browser build start
 
 #Patch101:        chromium-20100315-hidden-option.patch
@@ -298,6 +302,9 @@
 # Fix gcc4.5 NULL converstion errors
 %patch28 -p1 -b .fix-gcc-4.5
 
+# Fix tcmalloc gcc4.5 issue
+%patch29 -p1 -b .fix-tcmalloc-4.5
+
 
 #patch to re-org the visibility options in Chromium browser build  
 #%patch101 -p1

other changes:
--------------

++++++ tcmalloc-fix.patch (new)
--- tcmalloc-fix.patch
+++ tcmalloc-fix.patch
+diff -Nur chromium-6.0.417.0-20100526svn48276/third_party/tcmalloc/chromium/src/central_freelist.cc chromium-6.0.417.0-20100526svn48276-fix/third_party/tcmalloc/chromium/src/central_freelist.cc
+--- chromium-6.0.417.0-20100526svn48276/third_party/tcmalloc/chromium/src/central_freelist.cc	2010-05-26 23:54:14.000000000 +0800
++++ chromium-6.0.417.0-20100526svn48276-fix/third_party/tcmalloc/chromium/src/central_freelist.cc	2010-07-28 13:09:52.402573823 +0800
+@@ -57,9 +57,15 @@
+   }
+ }
+ 
+-void CentralFreeList::ReleaseToSpans(void* object) {
++  static __attribute__ ((noinline))
++Span* MapObjectToSpan(void* object) {
+   const PageID p = reinterpret_cast<uintptr_t>(object) >> kPageShift;
+   Span* span = Static::pageheap()->GetDescriptor(p);
++  return span;
++}
++
++ void CentralFreeList::ReleaseToSpans(void* object) {
++	 Span* span = MapObjectToSpan(object);
+   ASSERT(span != NULL);
+   ASSERT(span->refcount > 0);
+