- Revision
- 107690
- Author
- [email protected]
- Date
- 2012-02-14 01:52:47 -0800 (Tue, 14 Feb 2012)
Log Message
Fix typo. HTMLContentSeleciton -> HTMLContentSelection.
https://bugs.webkit.org/show_bug.cgi?id=78571
Reviewed by Hajime Morita.
No tests. No change in behavior.
* dom/NodeRenderingContext.cpp:
(WebCore::nextRendererOf):
(WebCore::previousRendererOf):
(WebCore::firstRendererOf):
(WebCore::lastRendererOf):
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::insertionPointFor):
* html/shadow/HTMLContentElement.cpp:
(WebCore::HTMLContentElement::attach):
* html/shadow/HTMLContentSelector.cpp:
(WebCore::HTMLContentSelection::append):
(WebCore::HTMLContentSelection::unlink):
(WebCore::HTMLContentSelectionList::find):
(WebCore::HTMLContentSelectionList::append):
(WebCore::HTMLContentSelector::select):
(WebCore::HTMLContentSelector::unselect):
(WebCore::HTMLContentSelector::findFor):
* html/shadow/HTMLContentSelector.h:
(HTMLContentSelection):
(WebCore::HTMLContentSelection::next):
(WebCore::HTMLContentSelection::previous):
(WebCore::HTMLContentSelection::HTMLContentSelection):
(WebCore::HTMLContentSelection::create):
(WebCore::HTMLContentSelectionList::first):
(WebCore::HTMLContentSelectionList::last):
(HTMLContentSelectionList):
(WebCore::HTMLContentSelectionSet::add):
(WebCore::HTMLContentSelectionSet::remove):
(HTMLContentSelectionSet):
(WebCore::HTMLContentSelectionSet::Translator::equal):
(WebCore::HTMLContentSelectionSet::Hash::hash):
(WebCore::HTMLContentSelectionSet::Hash::equal):
(WebCore::HTMLContentSelectionSet::find):
(HTMLContentSelector):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107689 => 107690)
--- trunk/Source/WebCore/ChangeLog 2012-02-14 09:50:41 UTC (rev 107689)
+++ trunk/Source/WebCore/ChangeLog 2012-02-14 09:52:47 UTC (rev 107690)
@@ -1,3 +1,47 @@
+2012-02-14 Hayato Ito <[email protected]>
+
+ Fix typo. HTMLContentSeleciton -> HTMLContentSelection.
+ https://bugs.webkit.org/show_bug.cgi?id=78571
+
+ Reviewed by Hajime Morita.
+
+ No tests. No change in behavior.
+
+ * dom/NodeRenderingContext.cpp:
+ (WebCore::nextRendererOf):
+ (WebCore::previousRendererOf):
+ (WebCore::firstRendererOf):
+ (WebCore::lastRendererOf):
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::insertionPointFor):
+ * html/shadow/HTMLContentElement.cpp:
+ (WebCore::HTMLContentElement::attach):
+ * html/shadow/HTMLContentSelector.cpp:
+ (WebCore::HTMLContentSelection::append):
+ (WebCore::HTMLContentSelection::unlink):
+ (WebCore::HTMLContentSelectionList::find):
+ (WebCore::HTMLContentSelectionList::append):
+ (WebCore::HTMLContentSelector::select):
+ (WebCore::HTMLContentSelector::unselect):
+ (WebCore::HTMLContentSelector::findFor):
+ * html/shadow/HTMLContentSelector.h:
+ (HTMLContentSelection):
+ (WebCore::HTMLContentSelection::next):
+ (WebCore::HTMLContentSelection::previous):
+ (WebCore::HTMLContentSelection::HTMLContentSelection):
+ (WebCore::HTMLContentSelection::create):
+ (WebCore::HTMLContentSelectionList::first):
+ (WebCore::HTMLContentSelectionList::last):
+ (HTMLContentSelectionList):
+ (WebCore::HTMLContentSelectionSet::add):
+ (WebCore::HTMLContentSelectionSet::remove):
+ (HTMLContentSelectionSet):
+ (WebCore::HTMLContentSelectionSet::Translator::equal):
+ (WebCore::HTMLContentSelectionSet::Hash::hash):
+ (WebCore::HTMLContentSelectionSet::Hash::equal):
+ (WebCore::HTMLContentSelectionSet::find):
+ (HTMLContentSelector):
+
2012-02-14 Mike Lawther <[email protected]>
CSS3 calc: embed calc expressions in CSSPrimitiveValue
Modified: trunk/Source/WebCore/dom/NodeRenderingContext.cpp (107689 => 107690)
--- trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-02-14 09:50:41 UTC (rev 107689)
+++ trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-02-14 09:52:47 UTC (rev 107690)
@@ -122,11 +122,11 @@
static RenderObject* nextRendererOf(HTMLContentElement* parent, Node* current)
{
- HTMLContentSeleciton* currentSelection = parent->selections()->find(current);
+ HTMLContentSelection* currentSelection = parent->selections()->find(current);
if (!currentSelection)
return 0;
- for (HTMLContentSeleciton* selection = currentSelection->next(); selection; selection = selection->next()) {
+ for (HTMLContentSelection* selection = currentSelection->next(); selection; selection = selection->next()) {
if (RenderObject* renderer = selection->node()->renderer())
return renderer;
}
@@ -138,7 +138,7 @@
{
RenderObject* lastRenderer = 0;
- for (HTMLContentSeleciton* selection = parent->selections()->first(); selection; selection = selection->next()) {
+ for (HTMLContentSelection* selection = parent->selections()->first(); selection; selection = selection->next()) {
if (selection->node() == current)
break;
if (RenderObject* renderer = selection->node()->renderer())
@@ -150,7 +150,7 @@
static RenderObject* firstRendererOf(HTMLContentElement* parent)
{
- for (HTMLContentSeleciton* selection = parent->selections()->first(); selection; selection = selection->next()) {
+ for (HTMLContentSelection* selection = parent->selections()->first(); selection; selection = selection->next()) {
if (RenderObject* renderer = selection->node()->renderer())
return renderer;
}
@@ -160,7 +160,7 @@
static RenderObject* lastRendererOf(HTMLContentElement* parent)
{
- for (HTMLContentSeleciton* selection = parent->selections()->last(); selection; selection = selection->previous()) {
+ for (HTMLContentSelection* selection = parent->selections()->last(); selection; selection = selection->previous()) {
if (RenderObject* renderer = selection->node()->renderer())
return renderer;
}
Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (107689 => 107690)
--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2012-02-14 09:50:41 UTC (rev 107689)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2012-02-14 09:52:47 UTC (rev 107690)
@@ -175,7 +175,7 @@
{
if (!m_selector)
return 0;
- HTMLContentSeleciton* found = m_selector->findFor(node);
+ HTMLContentSelection* found = m_selector->findFor(node);
if (!found)
return 0;
return found->insertionPoint();
Modified: trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp (107689 => 107690)
--- trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp 2012-02-14 09:50:41 UTC (rev 107689)
+++ trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp 2012-02-14 09:52:47 UTC (rev 107690)
@@ -82,7 +82,7 @@
HTMLElement::attach();
if (root) {
- for (HTMLContentSeleciton* selection = m_selections->first(); selection; selection = selection->next())
+ for (HTMLContentSelection* selection = m_selections->first(); selection; selection = selection->next())
selection->node()->attach();
}
}
Modified: trunk/Source/WebCore/html/shadow/HTMLContentSelector.cpp (107689 => 107690)
--- trunk/Source/WebCore/html/shadow/HTMLContentSelector.cpp 2012-02-14 09:50:41 UTC (rev 107689)
+++ trunk/Source/WebCore/html/shadow/HTMLContentSelector.cpp 2012-02-14 09:52:47 UTC (rev 107690)
@@ -34,7 +34,7 @@
namespace WebCore {
-void HTMLContentSeleciton::append(PassRefPtr<HTMLContentSeleciton> next)
+void HTMLContentSelection::append(PassRefPtr<HTMLContentSelection> next)
{
ASSERT(!m_next);
ASSERT(!next->previous());
@@ -42,13 +42,13 @@
m_next->m_previous = this;
}
-void HTMLContentSeleciton::unlink()
+void HTMLContentSelection::unlink()
{
ASSERT(!m_previous); // Can be called only for a head.
- RefPtr<HTMLContentSeleciton> item = this;
+ RefPtr<HTMLContentSelection> item = this;
while (item) {
ASSERT(!item->previous());
- RefPtr<HTMLContentSeleciton> nextItem = item->m_next;
+ RefPtr<HTMLContentSelection> nextItem = item->m_next;
item->m_next.clear();
if (nextItem)
nextItem->m_previous.clear();
@@ -65,9 +65,9 @@
ASSERT(isEmpty());
}
-HTMLContentSeleciton* HTMLContentSelectionList::find(Node* node) const
+HTMLContentSelection* HTMLContentSelectionList::find(Node* node) const
{
- for (HTMLContentSeleciton* item = first(); item; item = item->next()) {
+ for (HTMLContentSelection* item = first(); item; item = item->next()) {
if (node == item->node())
return item;
}
@@ -87,7 +87,7 @@
m_last.clear();
}
-void HTMLContentSelectionList::append(PassRefPtr<HTMLContentSeleciton> child)
+void HTMLContentSelectionList::append(PassRefPtr<HTMLContentSelection> child)
{
if (isEmpty()) {
ASSERT(!m_last);
@@ -120,7 +120,7 @@
if (!query.matches(child))
continue;
- RefPtr<HTMLContentSeleciton> selection = HTMLContentSeleciton::create(contentElement, child);
+ RefPtr<HTMLContentSelection> selection = HTMLContentSelection::create(contentElement, child);
selections->append(selection);
m_selectionSet.add(selection.get());
m_candidates[i] = 0;
@@ -129,12 +129,12 @@
void HTMLContentSelector::unselect(HTMLContentSelectionList* list)
{
- for (HTMLContentSeleciton* selection = list->first(); selection; selection = selection->next())
+ for (HTMLContentSelection* selection = list->first(); selection; selection = selection->next())
m_selectionSet.remove(selection);
list->clear();
}
-HTMLContentSeleciton* HTMLContentSelector::findFor(Node* key) const
+HTMLContentSelection* HTMLContentSelector::findFor(Node* key) const
{
return m_selectionSet.find(key);
}
Modified: trunk/Source/WebCore/html/shadow/HTMLContentSelector.h (107689 => 107690)
--- trunk/Source/WebCore/html/shadow/HTMLContentSelector.h 2012-02-14 09:50:41 UTC (rev 107689)
+++ trunk/Source/WebCore/html/shadow/HTMLContentSelector.h 2012-02-14 09:52:47 UTC (rev 107690)
@@ -43,34 +43,34 @@
class Node;
class ShadowRoot;
-class HTMLContentSeleciton : public RefCounted<HTMLContentSeleciton> {
+class HTMLContentSelection : public RefCounted<HTMLContentSelection> {
public:
- static PassRefPtr<HTMLContentSeleciton> create(HTMLContentElement*, Node*);
+ static PassRefPtr<HTMLContentSelection> create(HTMLContentElement*, Node*);
HTMLContentElement* insertionPoint() const { return m_insertionPoint; }
Node* node() const { return m_node.get(); }
- HTMLContentSeleciton* next() const { return m_next.get(); }
- HTMLContentSeleciton* previous() const { return m_previous.get(); }
+ HTMLContentSelection* next() const { return m_next.get(); }
+ HTMLContentSelection* previous() const { return m_previous.get(); }
- void append(PassRefPtr<HTMLContentSeleciton>);
+ void append(PassRefPtr<HTMLContentSelection>);
void unlink();
private:
- HTMLContentSeleciton(HTMLContentElement*, Node*);
+ HTMLContentSelection(HTMLContentElement*, Node*);
HTMLContentElement* m_insertionPoint;
RefPtr<Node> m_node;
- RefPtr<HTMLContentSeleciton> m_next;
- RefPtr<HTMLContentSeleciton> m_previous;
+ RefPtr<HTMLContentSelection> m_next;
+ RefPtr<HTMLContentSelection> m_previous;
};
-inline HTMLContentSeleciton::HTMLContentSeleciton(HTMLContentElement* insertionPoint, Node* node)
+inline HTMLContentSelection::HTMLContentSelection(HTMLContentElement* insertionPoint, Node* node)
: m_insertionPoint(insertionPoint), m_node(node)
{ }
-inline PassRefPtr<HTMLContentSeleciton> HTMLContentSeleciton::create(HTMLContentElement* insertionPoint, Node* node)
+inline PassRefPtr<HTMLContentSelection> HTMLContentSelection::create(HTMLContentElement* insertionPoint, Node* node)
{
- return adoptRef(new HTMLContentSeleciton(insertionPoint, node));
+ return adoptRef(new HTMLContentSelection(insertionPoint, node));
}
class HTMLContentSelectionList {
@@ -78,46 +78,46 @@
HTMLContentSelectionList();
~HTMLContentSelectionList();
- HTMLContentSeleciton* first() const { return m_first.get(); }
- HTMLContentSeleciton* last() const { return m_last.get(); }
- HTMLContentSeleciton* find(Node*) const;
+ HTMLContentSelection* first() const { return m_first.get(); }
+ HTMLContentSelection* last() const { return m_last.get(); }
+ HTMLContentSelection* find(Node*) const;
bool isEmpty() const { return !m_first; }
void clear();
- void append(PassRefPtr<HTMLContentSeleciton>);
+ void append(PassRefPtr<HTMLContentSelection>);
private:
- RefPtr<HTMLContentSeleciton> m_first;
- RefPtr<HTMLContentSeleciton> m_last;
+ RefPtr<HTMLContentSelection> m_first;
+ RefPtr<HTMLContentSelection> m_last;
};
class HTMLContentSelectionSet {
public:
- void add(HTMLContentSeleciton* value) { m_set.add(value); }
- void remove(HTMLContentSeleciton* value) { m_set.remove(value); }
+ void add(HTMLContentSelection* value) { m_set.add(value); }
+ void remove(HTMLContentSelection* value) { m_set.remove(value); }
bool isEmpty() const { return m_set.isEmpty(); }
- HTMLContentSeleciton* find(Node* key) const;
+ HTMLContentSelection* find(Node* key) const;
private:
struct Translator {
public:
static unsigned hash(const Node* key) { return PtrHash<const Node*>::hash(key); }
- static bool equal(const HTMLContentSeleciton* selection, const Node* node) { return selection->node() == node; }
+ static bool equal(const HTMLContentSelection* selection, const Node* node) { return selection->node() == node; }
};
struct Hash {
- static unsigned hash(HTMLContentSeleciton* key) { return PtrHash<const Node*>::hash(key->node()); }
- static bool equal(HTMLContentSeleciton* a, HTMLContentSeleciton* b) { return a->node() == b->node(); }
+ static unsigned hash(HTMLContentSelection* key) { return PtrHash<const Node*>::hash(key->node()); }
+ static bool equal(HTMLContentSelection* a, HTMLContentSelection* b) { return a->node() == b->node(); }
static const bool safeToCompareToEmptyOrDeleted = false;
};
- typedef HashSet<HTMLContentSeleciton*, Hash> PointerSet;
+ typedef HashSet<HTMLContentSelection*, Hash> PointerSet;
PointerSet m_set;
};
-inline HTMLContentSeleciton* HTMLContentSelectionSet::find(Node* key) const
+inline HTMLContentSelection* HTMLContentSelectionSet::find(Node* key) const
{
PointerSet::iterator found = m_set.find<Node*, HTMLContentSelectionSet::Translator>(key);
return found != m_set.end() ? *found : 0;
@@ -131,7 +131,7 @@
void select(HTMLContentElement*, HTMLContentSelectionList*);
void unselect(HTMLContentSelectionList*);
- HTMLContentSeleciton* findFor(Node* key) const;
+ HTMLContentSelection* findFor(Node* key) const;
void willSelectOver(ShadowRoot*);
void didSelect();
