From f7ac4f226810e991605c693ceac80d6023562d14 Mon Sep 17 00:00:00 2001 From: "kling@webkit.org" Date: Sun, 1 Jan 2012 04:34:01 +0000 Subject: [PATCH] HTMLCollection: Remove the constructor's custom CollectionCache* argument. 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): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@103872 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 22 ++++++++++++++++++++++ Source/WebCore/html/HTMLCollection.cpp | 6 +++--- Source/WebCore/html/HTMLCollection.h | 4 ++-- Source/WebCore/html/HTMLFormCollection.cpp | 4 ++-- Source/WebCore/html/HTMLNameCollection.cpp | 4 ++-- Source/WebCore/html/HTMLOptionsCollection.cpp | 4 ++-- Source/WebCore/html/HTMLTableRowsCollection.cpp | 4 ++-- 7 files changed, 35 insertions(+), 13 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 984f6c6..5c03635 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,25 @@ +2012-01-01 Andreas Kling + + HTMLCollection: Remove the constructor's custom CollectionCache* argument. + + + 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 WebCore changes for: REGRESSION (WebKit2): Cursor, hover states not updated when page scrolls under stationary mouse pointer diff --git a/Source/WebCore/html/HTMLCollection.cpp b/Source/WebCore/html/HTMLCollection.cpp index 225e3e6..7b9f725e 100644 --- a/Source/WebCore/html/HTMLCollection.cpp +++ b/Source/WebCore/html/HTMLCollection.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * 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(Document* document, CollectionType type) { } -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(); diff --git a/Source/WebCore/html/HTMLCollection.h b/Source/WebCore/html/HTMLCollection.h index a1cf96c..5d3b090 100644 --- a/Source/WebCore/html/HTMLCollection.h +++ b/Source/WebCore/html/HTMLCollection.h @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * 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 @@ public: CollectionType type() const { return static_cast(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; } diff --git a/Source/WebCore/html/HTMLFormCollection.cpp b/Source/WebCore/html/HTMLFormCollection.cpp index 7d453f7..ad6026f 100644 --- a/Source/WebCore/html/HTMLFormCollection.cpp +++ b/Source/WebCore/html/HTMLFormCollection.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * 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 @@ using namespace HTMLNames; // calculation every time if anything has changed. HTMLFormCollection::HTMLFormCollection(HTMLFormElement* form) - : HTMLCollection(form, OtherCollection, 0, /* retainBaseNode */ false) + : HTMLCollection(form, OtherCollection, /* retainBaseNode */ false) { } diff --git a/Source/WebCore/html/HTMLNameCollection.cpp b/Source/WebCore/html/HTMLNameCollection.cpp index 338e2a4..688c268 100644 --- a/Source/WebCore/html/HTMLNameCollection.cpp +++ b/Source/WebCore/html/HTMLNameCollection.cpp @@ -1,7 +1,7 @@ /* * Copyright (C) 1999 Lars Knoll (knoll@kde.org) * (C) 1999 Antti Koivisto (koivisto@kde.org) - * 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 @@ namespace WebCore { 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) { } diff --git a/Source/WebCore/html/HTMLOptionsCollection.cpp b/Source/WebCore/html/HTMLOptionsCollection.cpp index c4769e2..e36a9c8 100644 --- a/Source/WebCore/html/HTMLOptionsCollection.cpp +++ b/Source/WebCore/html/HTMLOptionsCollection.cpp @@ -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) { } diff --git a/Source/WebCore/html/HTMLTableRowsCollection.cpp b/Source/WebCore/html/HTMLTableRowsCollection.cpp index 6c9b74b..fda6289 100644 --- a/Source/WebCore/html/HTMLTableRowsCollection.cpp +++ b/Source/WebCore/html/HTMLTableRowsCollection.cpp @@ -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 @@ HTMLTableRowElement* HTMLTableRowsCollection::lastRow(HTMLTableElement* table) // 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) { } -- 2.7.4