diff options
| author | Steve Block <steveblock@google.com> | 2009-12-30 02:42:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-30 02:42:42 -0800 |
| commit | 38b30bc07ccf69f1edf0f88a88be3f576aae2998 (patch) | |
| tree | 1357f646619387ed6f1a3790c6af8f5e4efdef56 /WebCore | |
| parent | b2d509dabe27980408b27468d8f76f415e72955a (diff) | |
| parent | f10741666f912a79243950d07c8738ac4813710a (diff) | |
| download | external_webkit-38b30bc07ccf69f1edf0f88a88be3f576aae2998.zip external_webkit-38b30bc07ccf69f1edf0f88a88be3f576aae2998.tar.gz external_webkit-38b30bc07ccf69f1edf0f88a88be3f576aae2998.tar.bz2 | |
Merge "Android special-casing when using std::sort is no longer needed now that we use STLPort."
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/v8/V8GCController.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp index e08cf66..b478636 100644 --- a/WebCore/bindings/v8/V8GCController.cpp +++ b/WebCore/bindings/v8/V8GCController.cpp @@ -239,16 +239,6 @@ bool operator<(const GrouperItem& a, const GrouperItem& b) typedef Vector<GrouperItem> GrouperList; -#if PLATFORM(ANDROID) -// Android's implementation of std::sort seems unable to do the necessary -// template matching to pick up operator< for GrouperItem, so we have to -// manually pass a comparison function. -static bool compareGrouperItem(const GrouperItem& a, const GrouperItem& b) -{ - return a < b; -} -#endif - class ObjectGrouperVisitor : public DOMWrapperMap<Node>::Visitor { public: ObjectGrouperVisitor() @@ -295,11 +285,7 @@ public: void applyGrouping() { // Group by sorting by the group id. -#if PLATFORM(ANDROID) - std::sort(m_grouper.begin(), m_grouper.end(), compareGrouperItem); -#else std::sort(m_grouper.begin(), m_grouper.end()); -#endif // FIXME Should probably work in iterators here, but indexes were easier for my simple mind. for (size_t i = 0; i < m_grouper.size(); ) { |