Merge 80842 - 2011-03-11 Anton Muhin <antonm@chromium.org>...

Source/WebCore/bindings/v8/V8GCController.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 310 matching lines @@
     void addDOMObjectToGroup(DOMDataStore* store, uintptr_t groupId, void* object)
     {
         if (!object)
             return;
         v8::Persistent<v8::Object> wrapper = store->domObjectMap().get(object);
         if (!wrapper.IsEmpty())
             m_grouper.append(GrouperItem(groupId, wrapper));
     }
 };
 
+static uintptr_t calculateGroupId(StyleBase* styleBase)
+{
+    ASSERT(styleBase);
+    StyleBase* current = styleBase;
+    StyleSheet* styleSheet = 0;
+    while (true) {
+        // Special case: CSSStyleDeclarations should have CSSRule as a parent
+        // to proceed with parent traversal, otherwise they are coming from
+        // inlined style declaration and should be treated as a root.
+        if (current->isMutableStyleDeclaration()) {
+            CSSMutableStyleDeclaration* cssMutableStyleDeclaration = static_cast<CSSMutableStyleDeclaration*>(current);
+            if (CSSRule* parentRule = cssMutableStyleDeclaration->parentRule())
+                current = parentRule;
+            else
+                return reinterpret_cast<uintptr_t>(cssMutableStyleDeclaration);
+        }
+
+        if (current->isStyleSheet())
+            styleSheet = static_cast<StyleSheet*>(current);
+
+        StyleBase* parent = current->parent();
+        if (!parent)
+            break;
+        current = parent;
+    }
+
+    if (styleSheet)
+        return reinterpret_cast<uintptr_t>(styleSheet);
+
+    return reinterpret_cast<uintptr_t>(current);
+}
+
 class DOMObjectGrouperVisitor : public DOMWrapperMap<void>::Visitor {
 public:
     DOMObjectGrouperVisitor()
     {
     }
 
     void startMap()
     {
         m_grouper.shrink(0);
     }
@@ skipping 11 matching lines @@
         // FIXME: check if there are other StyleBase wrappers we should care of.
         if (V8CSSStyleSheet::info.equals(typeInfo)
             || V8CSSStyleDeclaration::info.equals(typeInfo)
             || V8CSSCharsetRule::info.equals(typeInfo)
             || V8CSSFontFaceRule::info.equals(typeInfo)
             || V8CSSStyleRule::info.equals(typeInfo)
             || V8CSSImportRule::info.equals(typeInfo)
             || V8CSSMediaRule::info.equals(typeInfo)) {
             StyleBase* styleBase = static_cast<StyleBase*>(object);
 
-            // We put the whole tree of style elements into a single object group.
-            // To achieve that we group elements by the roots of their trees.
-            StyleBase* root = styleBase;
-            ASSERT(root);
-            while (true) {
-                StyleBase* parent = root->parent();
-                if (!parent)
-                    break;
-                root = parent;
-            }
-            // Group id is an address of the root.
-            uintptr_t groupId = reinterpret_cast<uintptr_t>(root);
+            uintptr_t groupId = calculateGroupId(styleBase);
             m_grouper.append(GrouperItem(groupId, wrapper));
 
             if (V8CSSStyleDeclaration::info.equals(typeInfo)) {
                 CSSStyleDeclaration* cssStyleDeclaration = static_cast<CSSStyleDeclaration*>(styleBase);
                 if (cssStyleDeclaration->isMutableStyleDeclaration()) {
                     CSSMutableStyleDeclaration* cssMutableStyleDeclaration = static_cast<CSSMutableStyleDeclaration*>(cssStyleDeclaration);
                     CSSMutableStyleDeclaration::const_iterator end = cssMutableStyleDeclaration->end();
                     for (CSSMutableStyleDeclaration::const_iterator it = cssMutableStyleDeclaration->begin(); it != end; ++it) {
                         wrapper = store->domObjectMap().get(it->value());
                         if (!wrapper.IsEmpty())
@@ skipping 127 matching lines @@
     return;
 #endif
 
     int memoryUsageMB = getMemoryUsageInMB();
     if ((memoryUsageMB > lowUsageMB && memoryUsageMB > 2 * workingSetEstimateMB) || (memoryUsageMB > highUsageMB && memoryUsageMB > workingSetEstimateMB + highUsageDeltaMB))
         v8::V8::LowMemoryNotification();
 }
 
 
 }  // namespace WebCore