summaryrefslogtreecommitdiff
path: root/Source/WebCore/css/CSSSelectorList.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/css/CSSSelectorList.h')
-rw-r--r--Source/WebCore/css/CSSSelectorList.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/WebCore/css/CSSSelectorList.h b/Source/WebCore/css/CSSSelectorList.h
index 0173401df..8a88b9666 100644
--- a/Source/WebCore/css/CSSSelectorList.h
+++ b/Source/WebCore/css/CSSSelectorList.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2014 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,10 +23,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef CSSSelectorList_h
-#define CSSSelectorList_h
+#pragma once
#include "CSSSelector.h"
+#include <memory>
namespace WebCore {
@@ -37,11 +37,11 @@ class CSSSelectorList {
public:
CSSSelectorList() : m_selectorArray(0) { }
CSSSelectorList(const CSSSelectorList&);
+ CSSSelectorList(CSSSelectorList&&);
- ~CSSSelectorList();
+ ~CSSSelectorList() { deleteSelectors(); }
- void adopt(CSSSelectorList& list);
- void adoptSelectorVector(Vector<OwnPtr<CSSParserSelector>>& selectorVector);
+ void adoptSelectorVector(Vector<std::unique_ptr<CSSParserSelector>>& selectorVector);
void adoptSelectorArray(CSSSelector* selectors) { ASSERT(!m_selectorArray); m_selectorArray = selectors; }
bool isValid() const { return !!m_selectorArray; }
@@ -63,9 +63,12 @@ public:
bool hasInvalidSelector() const;
String selectorsText() const;
+ void buildSelectorsText(StringBuilder&) const;
unsigned componentCount() const;
+ CSSSelectorList& operator=(CSSSelectorList&&);
+
private:
void deleteSelectors();
@@ -83,5 +86,3 @@ inline const CSSSelector* CSSSelectorList::next(const CSSSelector* current)
}
} // namespace WebCore
-
-#endif // CSSSelectorList_h