Diff
Modified: trunk/Source/WebCore/ChangeLog (103871 => 103872)
--- trunk/Source/WebCore/ChangeLog 2012-01-01 02:19:07 UTC (rev 103871)
+++ trunk/Source/WebCore/ChangeLog 2012-01-01 04:34:01 UTC (rev 103872)
@@ -1,3 +1,25 @@
+2012-01-01 Andreas Kling <[email protected]>
+
+ HTMLCollection: Remove the constructor's custom CollectionCache* argument.
+ <http://webkit.org/b/75414>
+
+ Reviewed by Anders Carlsson.
+
+ We no longer need to initialize HTMLCollections with a custom CollectionCache,
+ so remove the argument from the constructor.
+
+ * html/HTMLCollection.cpp:
+ (WebCore::HTMLCollection::HTMLCollection):
+ * html/HTMLCollection.h:
+ * html/HTMLFormCollection.cpp:
+ (WebCore::HTMLFormCollection::HTMLFormCollection):
+ * html/HTMLNameCollection.cpp:
+ (WebCore::HTMLNameCollection::HTMLNameCollection):
+ * html/HTMLOptionsCollection.cpp:
+ (WebCore::HTMLOptionsCollection::HTMLOptionsCollection):
+ * html/HTMLTableRowsCollection.cpp:
+ (WebCore::HTMLTableRowsCollection::HTMLTableRowsCollection):
+
2011-12-31 Dan Bernstein <[email protected]>
WebCore changes for: REGRESSION (WebKit2): Cursor, hover states not updated when page scrolls under stationary mouse pointer
Modified: trunk/Source/WebCore/html/HTMLCollection.cpp (103871 => 103872)
--- trunk/Source/WebCore/html/HTMLCollection.cpp 2012-01-01 02:19:07 UTC (rev 103871)
+++ trunk/Source/WebCore/html/HTMLCollection.cpp 2012-01-01 04:34:01 UTC (rev 103872)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll ([email protected])
* (C) 1999 Antti Koivisto ([email protected])
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -47,13 +47,13 @@
{
}
-HTMLCollection::HTMLCollection(Node* base, CollectionType type, CollectionCache* info, bool retainBaseNode)
+HTMLCollection::HTMLCollection(Node* base, CollectionType type, bool retainBaseNode)
: m_baseIsRetained(retainBaseNode)
, m_includeChildren(shouldIncludeChildren(type))
, m_ownsInfo(false)
, m_type(type)
, m_base(base)
- , m_info(info)
+ , m_info(0)
{
if (m_baseIsRetained)
m_base->ref();
Modified: trunk/Source/WebCore/html/HTMLCollection.h (103871 => 103872)
--- trunk/Source/WebCore/html/HTMLCollection.h 2012-01-01 02:19:07 UTC (rev 103871)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2012-01-01 04:34:01 UTC (rev 103872)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll ([email protected])
* (C) 1999 Antti Koivisto ([email protected])
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -62,7 +62,7 @@
CollectionType type() const { return static_cast<CollectionType>(m_type); }
protected:
- HTMLCollection(Node* base, CollectionType, CollectionCache* = 0, bool retainBaseNode = true);
+ HTMLCollection(Node* base, CollectionType, bool retainBaseNode = true);
HTMLCollection(Document*, CollectionType);
CollectionCache* info() const { return m_info; }
Modified: trunk/Source/WebCore/html/HTMLFormCollection.cpp (103871 => 103872)
--- trunk/Source/WebCore/html/HTMLFormCollection.cpp 2012-01-01 02:19:07 UTC (rev 103871)
+++ trunk/Source/WebCore/html/HTMLFormCollection.cpp 2012-01-01 04:34:01 UTC (rev 103872)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll ([email protected])
* (C) 1999 Antti Koivisto ([email protected])
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010, 2011, 2012 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -37,7 +37,7 @@
// calculation every time if anything has changed.
HTMLFormCollection::HTMLFormCollection(HTMLFormElement* form)
- : HTMLCollection(form, OtherCollection, 0, /* retainBaseNode */ false)
+ : HTMLCollection(form, OtherCollection, /* retainBaseNode */ false)
{
}
Modified: trunk/Source/WebCore/html/HTMLNameCollection.cpp (103871 => 103872)
--- trunk/Source/WebCore/html/HTMLNameCollection.cpp 2012-01-01 02:19:07 UTC (rev 103871)
+++ trunk/Source/WebCore/html/HTMLNameCollection.cpp 2012-01-01 04:34:01 UTC (rev 103872)
@@ -1,7 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll ([email protected])
* (C) 1999 Antti Koivisto ([email protected])
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2011, 2012 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -33,7 +33,7 @@
using namespace HTMLNames;
HTMLNameCollection::HTMLNameCollection(Document* document, CollectionType type, const AtomicString& name)
- : HTMLCollection(document, type, 0, /* retainBaseNode */ false)
+ : HTMLCollection(document, type, /* retainBaseNode */ false)
, m_name(name)
{
}
Modified: trunk/Source/WebCore/html/HTMLOptionsCollection.cpp (103871 => 103872)
--- trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2012-01-01 02:19:07 UTC (rev 103871)
+++ trunk/Source/WebCore/html/HTMLOptionsCollection.cpp 2012-01-01 04:34:01 UTC (rev 103872)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2006, 2011, 2012 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -29,7 +29,7 @@
namespace WebCore {
HTMLOptionsCollection::HTMLOptionsCollection(HTMLSelectElement* select)
- : HTMLCollection(select, SelectOptions, 0, /* retainBaseNode */ false)
+ : HTMLCollection(select, SelectOptions, /* retainBaseNode */ false)
{
}
Modified: trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp (103871 => 103872)
--- trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp 2012-01-01 02:19:07 UTC (rev 103871)
+++ trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp 2012-01-01 04:34:01 UTC (rev 103872)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2011, 2012 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -152,7 +152,7 @@
// table to get at the collection cache. Order of argument evaluation is undefined and can
// differ between compilers.
HTMLTableRowsCollection::HTMLTableRowsCollection(HTMLTableElement* table)
- : HTMLCollection(table, OtherCollection, 0, /* retainBaseNode */ false)
+ : HTMLCollection(table, OtherCollection, /* retainBaseNode */ false)
{
}
