Diff
Modified: trunk/Source/WebCore/ChangeLog (107490 => 107491)
--- trunk/Source/WebCore/ChangeLog 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/ChangeLog 2012-02-11 23:58:18 UTC (rev 107491)
@@ -1,3 +1,21 @@
+2012-02-11 Sam Weinig <s...@webkit.org>
+
+ Fix the windows build.
+
+ Since Windows uses an all-in-one file to compile, the isRespectedPresentationAttribute()
+ functions all need unique names.
+
+ * html/HTMLBodyElement.cpp:
+ * html/HTMLHRElement.cpp:
+ * html/HTMLIFrameElement.cpp:
+ * html/HTMLImageElement.cpp:
+ * html/HTMLInputElement.cpp:
+ * html/HTMLMarqueeElement.cpp:
+ * html/HTMLPlugInElement.cpp:
+ * html/HTMLTableCellElement.cpp:
+ * html/HTMLTablePartElement.cpp:
+ * mathml/MathMLElement.cpp:
+
2012-02-11 Anders Carlsson <ander...@apple.com>
Overlay scrollbars don't appear when scrolling on the scrolling thread
Modified: trunk/Source/WebCore/html/HTMLBodyElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLBodyElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLBodyElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -61,7 +61,7 @@
{
}
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLBodyElement(Attribute* attr)
{
return attr->name() == backgroundAttr || attr->name() == marginwidthAttr || attr->name() == leftmarginAttr || attr->name() == marginheightAttr || attr->name() == topmarginAttr || attr->name() == bgcolorAttr || attr->name() == textAttr || attr->name() == bgpropertiesAttr;
@@ -87,14 +87,14 @@
if (equalIgnoringCase(attr->value(), "fixed"))
style->setProperty(CSSPropertyBackgroundAttachment, CSSValueFixed);
} else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLBodyElement(attr));
HTMLElement::collectStyleForAttribute(attr, style);
}
}
void HTMLBodyElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForHTMLBodyElement(attr))
setNeedsAttributeStyleUpdate();
else if (attr->name() == vlinkAttr || attr->name() == alinkAttr || attr->name() == linkAttr) {
if (attr->isNull()) {
Modified: trunk/Source/WebCore/html/HTMLHRElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLHRElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLHRElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -48,7 +48,7 @@
return adoptRef(new HTMLHRElement(tagName, document));
}
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLHRElement(Attribute* attr)
{
return attr->name() == alignAttr || attr->name() == widthAttr || attr->name() == colorAttr || attr->name() == noshadeAttr || attr->name() == sizeAttr;
}
@@ -95,14 +95,14 @@
else
addHTMLLengthToStyle(style, CSSPropertyHeight, String::number(size - 2)); // FIXME: Pass as integer.
} else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLHRElement(attr));
HTMLElement::collectStyleForAttribute(attr, style);
}
}
void HTMLHRElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForHTMLHRElement(attr))
setNeedsAttributeStyleUpdate();
else
HTMLElement::parseAttribute(attr);
Modified: trunk/Source/WebCore/html/HTMLIFrameElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -48,7 +48,7 @@
return adoptRef(new HTMLIFrameElement(tagName, document));
}
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLIFrameElement(Attribute* attr)
{
return attr->name() == widthAttr || attr->name() == heightAttr || attr->name() == alignAttr || attr->name() == frameborderAttr;
}
@@ -69,14 +69,14 @@
addHTMLLengthToStyle(style, CSSPropertyBorderWidth, "0"); // FIXME: Pass as integer.
}
} else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLIFrameElement(attr));
HTMLFrameElementBase::collectStyleForAttribute(attr, style);
}
}
void HTMLIFrameElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForHTMLIFrameElement(attr))
setNeedsAttributeStyleUpdate();
else if (attr->name() == nameAttr) {
const AtomicString& newName = attr->value();
Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -78,7 +78,7 @@
return image.release();
}
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLImageElement(Attribute* attr)
{
return attr->name() == widthAttr || attr->name() == heightAttr || attr->name() == borderAttr || attr->name() == vspaceAttr || attr->name() == hspaceAttr || attr->name() == alignAttr || attr->name() == valignAttr;
}
@@ -102,7 +102,7 @@
else if (attr->name() == valignAttr)
style->setProperty(CSSPropertyVerticalAlign, attr->value());
else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLImageElement(attr));
HTMLElement::collectStyleForAttribute(attr, style);
}
}
@@ -110,7 +110,7 @@
void HTMLImageElement::parseAttribute(Attribute* attr)
{
const QualifiedName& attrName = attr->name();
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForHTMLImageElement(attr))
setNeedsAttributeStyleUpdate();
else if (attrName == altAttr) {
if (renderer() && renderer()->isImage())
Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -658,7 +658,7 @@
m_inputType->accessKeyAction(sendMouseEvents);
}
-static inline bool isRespectedPresentationAttribute(HTMLInputElement* element, Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLInputElement(HTMLInputElement* element, Attribute* attr)
{
return attr->name() == vspaceAttr || attr->name() == hspaceAttr || attr->name() == alignAttr || attr->name() == widthAttr || attr->name() == heightAttr || (attr->name() == borderAttr && element->isImageButton());
}
@@ -683,14 +683,14 @@
} else if (attr->name() == borderAttr && isImageButton())
applyBorderAttributeToStyle(attr, style);
else {
- ASSERT(!isRespectedPresentationAttribute(this, attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLInputElement(this, attr));
return HTMLTextFormControlElement::collectStyleForAttribute(attr, style);
}
}
void HTMLInputElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(this, attr))
+ if (isRespectedPresentationAttributeForHTMLInputElement(this, attr))
setNeedsAttributeStyleUpdate();
else if (attr->name() == nameAttr) {
checkedRadioButtons().removeButton(this);
Modified: trunk/Source/WebCore/html/HTMLMarqueeElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLMarqueeElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLMarqueeElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -53,7 +53,7 @@
return marqueeElement.release();
}
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLMarqueeElement(Attribute* attr)
{
return attr->name() == widthAttr || attr->name() == heightAttr || attr->name() == bgcolorAttr || attr->name() == vspaceAttr || attr->name() == hspaceAttr || attr->name() == scrollamountAttr || attr->name() == scrolldelayAttr || attr->name() == loopAttr || attr->name() == behaviorAttr || attr->name() == directionAttr;
}
@@ -99,14 +99,14 @@
if (!attr->value().isEmpty())
style->setProperty(CSSPropertyWebkitMarqueeDirection, attr->value());
} else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLMarqueeElement(attr));
HTMLElement::collectStyleForAttribute(attr, style);
}
}
void HTMLMarqueeElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForHTMLMarqueeElement(attr))
setNeedsAttributeStyleUpdate();
else if (attr->name() == truespeedAttr)
m_minimumDelay = !attr->isEmpty() ? 0 : defaultMinimumDelay;
Modified: trunk/Source/WebCore/html/HTMLPlugInElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -140,7 +140,7 @@
return renderWidget->widget();
}
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLPlugInElement(Attribute* attr)
{
return attr->name() == widthAttr || attr->name() == heightAttr || attr->name() == vspaceAttr || attr->name() == hspaceAttr || attr->name() == alignAttr;
}
@@ -160,14 +160,14 @@
} else if (attr->name() == alignAttr)
applyAlignmentAttributeToStyle(attr, style);
else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLPlugInElement(attr));
HTMLFrameOwnerElement::collectStyleForAttribute(attr, style);
}
}
void HTMLPlugInElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForHTMLPlugInElement(attr))
setNeedsAttributeStyleUpdate();
else
HTMLFrameOwnerElement::parseAttribute(attr);
Modified: trunk/Source/WebCore/html/HTMLTableCellElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLTableCellElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLTableCellElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -75,7 +75,7 @@
return index;
}
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLTableCellElement(Attribute* attr)
{
return attr->name() == nowrapAttr || attr->name() == widthAttr || attr->name() == heightAttr;
}
@@ -97,14 +97,14 @@
addHTMLLengthToStyle(style, CSSPropertyHeight, attr->value());
}
} else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLTableCellElement(attr));
HTMLTablePartElement::collectStyleForAttribute(attr, style);
}
}
void HTMLTableCellElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForHTMLTableCellElement(attr))
setNeedsAttributeStyleUpdate();
else if (attr->name() == rowspanAttr) {
if (renderer() && renderer()->isTableCell())
Modified: trunk/Source/WebCore/html/HTMLTablePartElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/html/HTMLTablePartElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/html/HTMLTablePartElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -38,7 +38,7 @@
using namespace HTMLNames;
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForHTMLTablePartElement(Attribute* attr)
{
return attr->name() == bgcolorAttr || attr->name() == backgroundAttr || attr->name() == bordercolorAttr || attr->name() == valignAttr || attr->name() == alignAttr || attr->name() == heightAttr;
}
@@ -77,14 +77,14 @@
if (!attr->value().isEmpty())
addHTMLLengthToStyle(style, CSSPropertyHeight, attr->value());
} else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForHTMLTablePartElement(attr));
HTMLElement::collectStyleForAttribute(attr, style);
}
}
void HTMLTablePartElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForHTMLTablePartElement(attr))
setNeedsAttributeStyleUpdate();
else
HTMLElement::parseAttribute(attr);
Modified: trunk/Source/WebCore/mathml/MathMLElement.cpp (107490 => 107491)
--- trunk/Source/WebCore/mathml/MathMLElement.cpp 2012-02-11 23:36:34 UTC (rev 107490)
+++ trunk/Source/WebCore/mathml/MathMLElement.cpp 2012-02-11 23:58:18 UTC (rev 107491)
@@ -48,7 +48,7 @@
return adoptRef(new MathMLElement(tagName, document));
}
-static inline bool isRespectedPresentationAttribute(Attribute* attr)
+static inline bool isRespectedPresentationAttributeForMathMLElement(Attribute* attr)
{
return attr->name() == mathbackgroundAttr || attr->name() == mathsizeAttr || attr->name() == mathcolorAttr || attr->name() == fontsizeAttr || attr->name() == backgroundAttr || attr->name() == colorAttr || attr->name() == fontstyleAttr || attr->name() == fontweightAttr || attr->name() == fontfamilyAttr;
}
@@ -77,14 +77,14 @@
else if (attr->name() == fontfamilyAttr)
style->setProperty(CSSPropertyFontFamily, attr->value());
else {
- ASSERT(!isRespectedPresentationAttribute(attr));
+ ASSERT(!isRespectedPresentationAttributeForMathMLElement(attr));
StyledElement::collectStyleForAttribute(attr, style);
}
}
void MathMLElement::parseAttribute(Attribute* attr)
{
- if (isRespectedPresentationAttribute(attr))
+ if (isRespectedPresentationAttributeForMathMLElement(attr))
setNeedsAttributeStyleUpdate();
else
StyledElement::parseAttribute(attr);
