Diff
Modified: trunk/Source/WebCore/ChangeLog (122352 => 122353)
--- trunk/Source/WebCore/ChangeLog 2012-07-11 18:49:33 UTC (rev 122352)
+++ trunk/Source/WebCore/ChangeLog 2012-07-11 18:53:12 UTC (rev 122353)
@@ -1,3 +1,22 @@
+2012-07-11 Ryosuke Niwa <[email protected]>
+
+ Clang build fix after r122345.
+ Also let XCode do its own thing.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * html/HTMLCollection.cpp:
+ (WebCore::HTMLCollectionWithArrayStorage::item):
+ * html/HTMLCollection.h:
+ (HTMLCollectionWithArrayStorage):
+ * html/HTMLFormCollection.cpp:
+ (WebCore::HTMLFormCollection::itemInArrayAfter):
+ * html/HTMLFormCollection.h:
+ (HTMLFormCollection):
+ * html/HTMLPropertiesCollection.cpp:
+ (WebCore::HTMLPropertiesCollection::itemInArrayAfter):
+ * html/HTMLPropertiesCollection.h:
+ (HTMLPropertiesCollection):
+
2012-07-11 Arnaud Renevier <[email protected]>
[Gtk] allow building with css-filters
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (122352 => 122353)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-07-11 18:49:33 UTC (rev 122352)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-07-11 18:53:12 UTC (rev 122353)
@@ -1868,7 +1868,6 @@
75793ED50D0CE85B007FC0AC /* DOMMessageEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75793ED20D0CE85B007FC0AC /* DOMMessageEventInternal.h */; };
758978EC127090D60076D5A9 /* SpeechInputResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 758978EA127090D60076D5A9 /* SpeechInputResult.cpp */; };
762F1ED7159D960A007408F2 /* HTMLDialogElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 762F1ED6159D960A007408F2 /* HTMLDialogElement.h */; };
- 762F1ED9159D961A007408F2 /* HTMLDialogElement.idl in Resources */ = {isa = PBXBuildFile; fileRef = 762F1ED8159D961A007408F2 /* HTMLDialogElement.idl */; };
762F1EDB159D968A007408F2 /* HTMLDialogElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 762F1EDA159D968A007408F2 /* HTMLDialogElement.cpp */; };
7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */; };
7633A72713D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */; };
@@ -8991,8 +8990,8 @@
762F1EDA159D968A007408F2 /* HTMLDialogElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLDialogElement.cpp; sourceTree = "<group>"; };
7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocaleToScriptMapping.h; sourceTree = "<group>"; };
7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocaleToScriptMappingDefault.cpp; sourceTree = "<group>"; };
- 76808B4D159DADFA002B5233 /* JSHTMLDialogElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSHTMLDialogElement.cpp; path = JSHTMLDialogElement.cpp; sourceTree = "<group>"; };
- 76808B4E159DADFA002B5233 /* JSHTMLDialogElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSHTMLDialogElement.h; path = JSHTMLDialogElement.h; sourceTree = "<group>"; };
+ 76808B4D159DADFA002B5233 /* JSHTMLDialogElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLDialogElement.cpp; sourceTree = "<group>"; };
+ 76808B4E159DADFA002B5233 /* JSHTMLDialogElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLDialogElement.h; sourceTree = "<group>"; };
7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMTokenList.cpp; sourceTree = "<group>"; };
7694563B1214D97C0007CBAE /* JSDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMTokenList.h; sourceTree = "<group>"; };
769456591214DB630007CBAE /* DOMDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDOMTokenList.h; sourceTree = "<group>"; };
Modified: trunk/Source/WebCore/html/HTMLCollection.cpp (122352 => 122353)
--- trunk/Source/WebCore/html/HTMLCollection.cpp 2012-07-11 18:49:33 UTC (rev 122352)
+++ trunk/Source/WebCore/html/HTMLCollection.cpp 2012-07-11 18:53:12 UTC (rev 122353)
@@ -252,7 +252,7 @@
if (!isItemCacheValid() || cachedItemOffset() > index) {
unsigned offsetInArray = 0;
- setItemCache(itemAfter(offsetInArray, 0), 0, 0);
+ setItemCache(itemInArrayAfter(offsetInArray, 0), 0, 0);
ASSERT(isItemCacheValid());
if (!cachedItem() || cachedItemOffset() == index)
return cachedItem();
@@ -264,7 +264,7 @@
ASSERT(currentIndex < index);
unsigned offsetInArray = cachedElementsArrayOffset();
- while ((currentItem = itemAfter(offsetInArray, currentItem))) {
+ while ((currentItem = itemInArrayAfter(offsetInArray, currentItem))) {
currentIndex++;
if (currentIndex == index) {
setItemCache(currentItem, currentIndex, offsetInArray);
Modified: trunk/Source/WebCore/html/HTMLCollection.h (122352 => 122353)
--- trunk/Source/WebCore/html/HTMLCollection.h 2012-07-11 18:49:33 UTC (rev 122352)
+++ trunk/Source/WebCore/html/HTMLCollection.h 2012-07-11 18:53:12 UTC (rev 122353)
@@ -164,7 +164,7 @@
virtual Node* item(unsigned index) const OVERRIDE;
private:
- virtual HTMLElement* itemAfter(unsigned& offsetInArray, HTMLElement* previousItem) const = 0;
+ virtual HTMLElement* itemInArrayAfter(unsigned& offsetInArray, HTMLElement* previousItem) const = 0;
};
} // namespace
Modified: trunk/Source/WebCore/html/HTMLFormCollection.cpp (122352 => 122353)
--- trunk/Source/WebCore/html/HTMLFormCollection.cpp 2012-07-11 18:49:33 UTC (rev 122352)
+++ trunk/Source/WebCore/html/HTMLFormCollection.cpp 2012-07-11 18:53:12 UTC (rev 122353)
@@ -75,7 +75,7 @@
return static_cast<HTMLFieldSetElement*>(base())->length();
}
-HTMLElement* HTMLFormCollection::itemAfter(unsigned& offset, HTMLElement* previousItem) const
+HTMLElement* HTMLFormCollection::itemInArrayAfter(unsigned& offset, HTMLElement* previousItem) const
{
const Vector<FormAssociatedElement*>& elementsArray = formControlElements();
if (previousItem)
Modified: trunk/Source/WebCore/html/HTMLFormCollection.h (122352 => 122353)
--- trunk/Source/WebCore/html/HTMLFormCollection.h 2012-07-11 18:49:33 UTC (rev 122352)
+++ trunk/Source/WebCore/html/HTMLFormCollection.h 2012-07-11 18:53:12 UTC (rev 122353)
@@ -50,7 +50,7 @@
const Vector<FormAssociatedElement*>& formControlElements() const;
const Vector<HTMLImageElement*>& formImageElements() const;
- HTMLElement* itemAfter(unsigned& offset, HTMLElement* previousItem) const OVERRIDE;
+ HTMLElement* itemInArrayAfter(unsigned& offset, HTMLElement* previousItem) const OVERRIDE;
};
} //namespace
Modified: trunk/Source/WebCore/html/HTMLPropertiesCollection.cpp (122352 => 122353)
--- trunk/Source/WebCore/html/HTMLPropertiesCollection.cpp 2012-07-11 18:49:33 UTC (rev 122352)
+++ trunk/Source/WebCore/html/HTMLPropertiesCollection.cpp 2012-07-11 18:53:12 UTC (rev 122353)
@@ -112,7 +112,7 @@
? node->traverseNextNode(base) : node->traverseNextSibling(base);
}
-HTMLElement* HTMLPropertiesCollection::itemAfter(unsigned& offsetInArray, HTMLElement* previousItem) const
+HTMLElement* HTMLPropertiesCollection::itemInArrayAfter(unsigned& offsetInArray, HTMLElement* previousItem) const
{
while (offsetInArray < m_itemRefElements.size()) {
if (HTMLElement* next = itemAfter(m_itemRefElements[offsetInArray], previousItem))
Modified: trunk/Source/WebCore/html/HTMLPropertiesCollection.h (122352 => 122353)
--- trunk/Source/WebCore/html/HTMLPropertiesCollection.h 2012-07-11 18:49:33 UTC (rev 122352)
+++ trunk/Source/WebCore/html/HTMLPropertiesCollection.h 2012-07-11 18:53:12 UTC (rev 122353)
@@ -68,7 +68,7 @@
Node* findRefElements(Node* previous) const;
void cacheFirstItem() const;
- virtual HTMLElement* itemAfter(unsigned& offsetInArray, HTMLElement* previousItemInSameArrayElement) const OVERRIDE;
+ virtual HTMLElement* itemInArrayAfter(unsigned& offsetInArray, HTMLElement* previousItemInSameArrayElement) const OVERRIDE;
HTMLElement* itemAfter(HTMLElement* base, HTMLElement* previous) const;
void updateNameCache() const;