Simplify CFDE_CSSStyleSelector::SortRulesTo().

xfa/src/fdp/src/css/fde_cssstyleselector.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/src/fdp/src/css/fde_csscache.h"
 #include "xfa/src/fdp/src/css/fde_cssdeclaration.h"
 #include "xfa/src/fdp/src/css/fde_cssstyleselector.h"
 #include "xfa/src/foxitlib.h"
+
 int32_t CFDE_CSSCounterStyle::FindIndex(const FX_WCHAR* pszIdentifier) {
   int32_t iCount = m_arrCounterData.GetSize();
   for (int32_t i = 0; i < iCount; i++) {
     if (FXSYS_wcscmp(pszIdentifier, m_arrCounterData.ElementAt(i).m_pszIdent) ==
         0) {
       return i;
     }
   }
   return -1;
 }
@@ skipping 160 matching lines @@
                                        IFDE_CSSDeclaration* pDecl) {
   void* pKey = (void*)(uintptr_t)dwKey;
   FDE_CSSRULEDATA* pData = NewRuleData(pSel, pDecl);
   FDE_CSSRULEDATA* pList = NULL;
   if (!map.Lookup(pKey, (void*&)pList)) {
     map.SetAt(pKey, pData);
   } else if (AddRuleTo(pList, pData)) {
     map.SetAt(pKey, pList);
   }
 }
-inline FX_BOOL CFDE_CSSRuleCollection::AddRuleTo(FDE_CSSRULEDATA*& pList,
-                                                 FDE_CSSRULEDATA* pData) {
-  if (pList == NULL) {
-    pList = pData;
-    return TRUE;
-  } else {
+
+FX_BOOL CFDE_CSSRuleCollection::AddRuleTo(FDE_CSSRULEDATA*& pList,
+                                          FDE_CSSRULEDATA* pData) {
+  if (pList) {
     pData->pNext = pList->pNext;
     pList->pNext = pData;
     return FALSE;
   }
+
+  pList = pData;
+  return TRUE;
 }
-inline FDE_CSSRULEDATA* CFDE_CSSRuleCollection::NewRuleData(
+
+FDE_CSSRULEDATA* CFDE_CSSRuleCollection::NewRuleData(
     IFDE_CSSSelector* pSel,
     IFDE_CSSDeclaration* pDecl) {
   return FDE_NewWith(m_pStaticStore)
       FDE_CSSRULEDATA(pSel, pDecl, ++m_iSelectors);
 }
+
 IFDE_CSSStyleSelector* IFDE_CSSStyleSelector::Create() {
   return new CFDE_CSSStyleSelector;
 }
 CFDE_CSSStyleSelector::CFDE_CSSStyleSelector()
     : m_pFontMgr(NULL),
       m_fDefFontSize(12.0f),
       m_pRuleDataStore(NULL),
       m_pInlineStyleStore(NULL),
       m_pFixedStyleStore(NULL),
       m_pAccelerator(NULL) {
@@ skipping 116 matching lines @@
       }
       int32_t iCount = pCache->CountHashClass();
       for (int32_t i = 0; i < iCount; i++) {
         pCache->SetClassIndex(i);
         MatchRules(pCache, rules.GetClassRuleData(pCache->HashClass()),
                    ePersudoType);
       }
     } else {
       MatchRules(pCache, rules.GetPersudoRuleData(), ePersudoType);
     }
-    if (m_MatchedRules.GetSize() > 0) {
-      SortRulesTo(matchedDecls);
-      m_MatchedRules.RemoveAt(0, m_MatchedRules.GetSize());
+    if (!m_MatchedRules.empty()) {

[Tom Sepez, 2016/02/23 23:34:02]

Do we still need this if? begin() and end() on an empty vector should be legit,
unlike the old GetUpperBound() etc.

[Lei Zhang, 2016/02/24 00:06:35]

Nope.

+      std::sort(m_MatchedRules.begin(), m_MatchedRules.end(),
+                [](const FDE_CSSRULEDATA* p1, const FDE_CSSRULEDATA* p2) {
+                  return p1->dwPriority < p2->dwPriority;
+                });
+      for (const auto& rule : m_MatchedRules)
+        matchedDecls.Add(rule->pDeclaration);
+      m_MatchedRules.clear();
     }
   }
   return matchedDecls.GetSize();
 }
-inline void CFDE_CSSStyleSelector::MatchRules(FDE_CSSTAGCACHE* pCache,
-                                              FDE_CSSRULEDATA* pList,
-                                              FDE_CSSPERSUDO ePersudoType) {
-  while (pList != NULL) {
-    if (MatchSelector(pCache, pList->pSelector, ePersudoType)) {
-      m_MatchedRules.Add(pList);
-    }
+
+void CFDE_CSSStyleSelector::MatchRules(FDE_CSSTAGCACHE* pCache,
+                                       FDE_CSSRULEDATA* pList,
+                                       FDE_CSSPERSUDO ePersudoType) {
+  while (pList) {
+    if (MatchSelector(pCache, pList->pSelector, ePersudoType))
+      m_MatchedRules.push_back(pList);
     pList = pList->pNext;
   }
 }
+
 FX_BOOL CFDE_CSSStyleSelector::MatchSelector(FDE_CSSTAGCACHE* pCache,
                                              IFDE_CSSSelector* pSel,
                                              FDE_CSSPERSUDO ePersudoType) {
   FX_DWORD dwHash;
   while (pSel != NULL && pCache != NULL) {
     switch (pSel->GetType()) {
       case FDE_CSSSELECTORTYPE_Descendant:
         dwHash = pSel->GetNameHash();
         while ((pCache = pCache->GetParent()) != NULL) {
           if (dwHash != FDE_CSSUNIVERSALHASH && dwHash != pCache->HashTag()) {
@@ skipping 29 matching lines @@
         }
         break;
       default:
         FXSYS_assert(FALSE);
         break;
     }
     pSel = pSel->GetNextSelector();
   }
   return pSel == NULL && pCache != NULL;
 }
-void CFDE_CSSStyleSelector::SortRulesTo(CFDE_CSSDeclarationArray& matchDecls) {
-  for (int32_t j = m_MatchedRules.GetUpperBound(); j >= 0; --j) {
-    FDE_CSSRULEDATA*& pMin = m_MatchedRules.ElementAt(j);
-    FX_DWORD dwMin = pMin->dwPriority;
-    for (int32_t i = j - 1; i >= 0; --i) {
-      FDE_CSSRULEDATA*& pCur = m_MatchedRules.ElementAt(i);
-      if (dwMin > pCur->dwPriority) {
-        dwMin = pCur->dwPriority;
-        FDE_CSSRULEDATA* p = pMin;
-        pMin = pCur;
-        pCur = p;
-      }
-    }
-    matchDecls.Add(pMin->pDeclaration);
-  }
-}
+
 void CFDE_CSSStyleSelector::ComputeStyle(
     IFDE_CSSTagProvider* pTag,
     const IFDE_CSSDeclaration** ppDeclArray,
     int32_t iDeclCount,
     IFDE_CSSComputedStyle* pDestStyle) {
   FXSYS_assert(iDeclCount >= 0);
   FXSYS_assert(pDestStyle);
   FX_POSITION pos = pTag->GetFirstAttribute();
   if (pos != NULL) {
     if (m_pInlineStyleStore == NULL) {
@@ skipping 1353 matching lines @@
       return FDE_CSSTEXTTRANSFORM_LowerCase;
     default:
       return FDE_CSSTEXTTRANSFORM_None;
   }
 }
 FDE_CSSFONTVARIANT CFDE_CSSStyleSelector::ToFontVariant(
     FDE_CSSPROPERTYVALUE eValue) {
   return eValue == FDE_CSSPROPERTYVALUE_SmallCaps ? FDE_CSSFONTVARIANT_SmallCaps
                                                   : FDE_CSSFONTVARIANT_Normal;
 }