summaryrefslogtreecommitdiffstats
path: root/WebCore/html
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/html')
-rw-r--r--WebCore/html/HTMLAppletElement.cpp19
-rw-r--r--WebCore/html/HTMLEmbedElement.cpp20
-rw-r--r--WebCore/html/HTMLFormElement.cpp25
-rw-r--r--WebCore/html/HTMLFormElement.h5
-rw-r--r--WebCore/html/HTMLImageElement.cpp29
-rw-r--r--WebCore/html/HTMLImageElement.h5
-rw-r--r--WebCore/html/HTMLObjectElement.cpp19
-rw-r--r--WebCore/html/HTMLPlugInElement.cpp5
-rw-r--r--WebCore/html/HTMLPlugInElement.h5
9 files changed, 0 insertions, 132 deletions
diff --git a/WebCore/html/HTMLAppletElement.cpp b/WebCore/html/HTMLAppletElement.cpp
index d637ce0..bdb1cca 100644
--- a/WebCore/html/HTMLAppletElement.cpp
+++ b/WebCore/html/HTMLAppletElement.cpp
@@ -43,15 +43,6 @@ HTMLAppletElement::HTMLAppletElement(Document* doc)
HTMLAppletElement::~HTMLAppletElement()
{
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure the m_name and m_id are removed from HTMLDocument's NameCountMap
- if (oldNameIdCount && document()->isHTMLDocument()) {
- HTMLDocument* doc = static_cast<HTMLDocument*>(document());
- doc->removeNamedItem(m_name);
- doc->removeExtraNamedItem(m_id);
- }
-#endif
}
void HTMLAppletElement::parseMappedAttribute(MappedAttribute* attr)
@@ -91,11 +82,6 @@ void HTMLAppletElement::insertedIntoDocument()
HTMLDocument* document = static_cast<HTMLDocument*>(this->document());
document->addNamedItem(m_name);
document->addExtraNamedItem(m_id);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure the m_name and m_id are removed from HTMLDocument's NameCountMap
- oldNameIdCount++;
-#endif
}
HTMLPlugInElement::insertedIntoDocument();
@@ -107,11 +93,6 @@ void HTMLAppletElement::removedFromDocument()
HTMLDocument* document = static_cast<HTMLDocument*>(this->document());
document->removeNamedItem(m_name);
document->removeExtraNamedItem(m_id);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure the m_name and m_id are removed from HTMLDocument's NameCountMap
- oldNameIdCount--;
-#endif
}
HTMLPlugInElement::removedFromDocument();
diff --git a/WebCore/html/HTMLEmbedElement.cpp b/WebCore/html/HTMLEmbedElement.cpp
index 7ffe3b1..1beb563 100644
--- a/WebCore/html/HTMLEmbedElement.cpp
+++ b/WebCore/html/HTMLEmbedElement.cpp
@@ -48,14 +48,6 @@ HTMLEmbedElement::HTMLEmbedElement(Document* doc)
HTMLEmbedElement::~HTMLEmbedElement()
{
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- if (oldNameIdCount && document()->isHTMLDocument()) {
- HTMLDocument* doc = static_cast<HTMLDocument*>(document());
- doc->removeNamedItem(m_name);
- }
-#endif
}
static inline RenderWidget* findWidgetRenderer(const Node* n)
@@ -188,12 +180,6 @@ void HTMLEmbedElement::insertedIntoDocument()
{
if (document()->isHTMLDocument())
static_cast<HTMLDocument*>(document())->addNamedItem(m_name);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- if (document()->isHTMLDocument())
- oldNameIdCount++;
-#endif
String width = getAttribute(widthAttr);
String height = getAttribute(heightAttr);
@@ -216,12 +202,6 @@ void HTMLEmbedElement::removedFromDocument()
{
if (document()->isHTMLDocument())
static_cast<HTMLDocument*>(document())->removeNamedItem(m_name);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- if (document()->isHTMLDocument())
- oldNameIdCount--;
-#endif
HTMLPlugInElement::removedFromDocument();
}
diff --git a/WebCore/html/HTMLFormElement.cpp b/WebCore/html/HTMLFormElement.cpp
index 28ea290..0e4d88e 100644
--- a/WebCore/html/HTMLFormElement.cpp
+++ b/WebCore/html/HTMLFormElement.cpp
@@ -76,24 +76,11 @@ HTMLFormElement::HTMLFormElement(Document* doc)
, m_doingsubmit(false)
, m_inreset(false)
, m_malformed(false)
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- , oldNameCount(0)
-#endif
{
}
HTMLFormElement::~HTMLFormElement()
{
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- if (oldNameCount && document()->isHTMLDocument()) {
- HTMLDocument* doc = static_cast<HTMLDocument*>(document());
- doc->removeNamedItem(m_name);
- }
-#endif
if (!m_autocomplete)
document()->unregisterForDocumentActivationCallbacks(this);
@@ -120,12 +107,6 @@ void HTMLFormElement::insertedIntoDocument()
{
if (document()->isHTMLDocument())
static_cast<HTMLDocument*>(document())->addNamedItem(m_name);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- if (document()->isHTMLDocument())
- oldNameCount++;
-#endif
HTMLElement::insertedIntoDocument();
}
@@ -134,12 +115,6 @@ void HTMLFormElement::removedFromDocument()
{
if (document()->isHTMLDocument())
static_cast<HTMLDocument*>(document())->removeNamedItem(m_name);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- if (document()->isHTMLDocument())
- oldNameCount--;
-#endif
HTMLElement::removedFromDocument();
}
diff --git a/WebCore/html/HTMLFormElement.h b/WebCore/html/HTMLFormElement.h
index c65304b..464a53c 100644
--- a/WebCore/html/HTMLFormElement.h
+++ b/WebCore/html/HTMLFormElement.h
@@ -157,11 +157,6 @@ private:
bool m_inreset : 1;
bool m_malformed : 1;
AtomicString m_name;
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- int oldNameCount;
-#endif
};
} // namespace WebCore
diff --git a/WebCore/html/HTMLImageElement.cpp b/WebCore/html/HTMLImageElement.cpp
index d319553..ea05689 100644
--- a/WebCore/html/HTMLImageElement.cpp
+++ b/WebCore/html/HTMLImageElement.cpp
@@ -44,11 +44,6 @@ HTMLImageElement::HTMLImageElement(Document* doc, HTMLFormElement* f)
, ismap(false)
, m_form(f)
, m_compositeOperator(CompositeSourceOver)
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- , oldNameIdCount(0)
-#endif
{
if (f)
f->registerImgElement(this);
@@ -60,25 +55,11 @@ HTMLImageElement::HTMLImageElement(const QualifiedName& tagName, Document* doc)
, ismap(false)
, m_form(0)
, m_compositeOperator(CompositeSourceOver)
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- , oldNameIdCount(0)
-#endif
{
}
HTMLImageElement::~HTMLImageElement()
{
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- if (oldNameIdCount && document()->isHTMLDocument()) {
- HTMLDocument* doc = static_cast<HTMLDocument*>(document());
- doc->removeNamedItem(m_name);
- doc->removeExtraNamedItem(m_id);
- }
-#endif
if (m_form)
m_form->removeImgElement(this);
}
@@ -211,11 +192,6 @@ void HTMLImageElement::insertedIntoDocument()
HTMLDocument* document = static_cast<HTMLDocument*>(this->document());
document->addNamedItem(m_name);
document->addExtraNamedItem(m_id);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- oldNameIdCount++;
-#endif
}
HTMLElement::insertedIntoDocument();
@@ -227,11 +203,6 @@ void HTMLImageElement::removedFromDocument()
HTMLDocument* document = static_cast<HTMLDocument*>(this->document());
document->removeNamedItem(m_name);
document->removeExtraNamedItem(m_id);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- oldNameIdCount--;
-#endif
}
HTMLElement::removedFromDocument();
diff --git a/WebCore/html/HTMLImageElement.h b/WebCore/html/HTMLImageElement.h
index 848ecb1..a7a6c62 100644
--- a/WebCore/html/HTMLImageElement.h
+++ b/WebCore/html/HTMLImageElement.h
@@ -124,11 +124,6 @@ private:
AtomicString m_name;
AtomicString m_id;
CompositeOperator m_compositeOperator;
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- int oldNameIdCount;
-#endif
};
} //namespace
diff --git a/WebCore/html/HTMLObjectElement.cpp b/WebCore/html/HTMLObjectElement.cpp
index 694f2d3..940d0b4 100644
--- a/WebCore/html/HTMLObjectElement.cpp
+++ b/WebCore/html/HTMLObjectElement.cpp
@@ -54,15 +54,6 @@ HTMLObjectElement::HTMLObjectElement(Document* doc, bool createdByParser)
HTMLObjectElement::~HTMLObjectElement()
{
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- if (oldNameIdCount && document()->isHTMLDocument()) {
- HTMLDocument* doc = static_cast<HTMLDocument*>(document());
- doc->removeNamedItem(m_name);
- doc->removeExtraNamedItem(m_id);
- }
-#endif
}
RenderWidget* HTMLObjectElement::renderWidgetForJSBindings() const
@@ -199,11 +190,6 @@ void HTMLObjectElement::insertedIntoDocument()
HTMLDocument* document = static_cast<HTMLDocument*>(this->document());
document->addNamedItem(m_name);
document->addExtraNamedItem(m_id);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- oldNameIdCount++;
-#endif
}
HTMLPlugInElement::insertedIntoDocument();
@@ -215,11 +201,6 @@ void HTMLObjectElement::removedFromDocument()
HTMLDocument* document = static_cast<HTMLDocument*>(this->document());
document->removeNamedItem(m_name);
document->removeExtraNamedItem(m_id);
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name and m_id are removed from HTMLDocument's NameCountMap
- oldNameIdCount--;
-#endif
}
HTMLPlugInElement::removedFromDocument();
diff --git a/WebCore/html/HTMLPlugInElement.cpp b/WebCore/html/HTMLPlugInElement.cpp
index 5f585e7..7334132 100644
--- a/WebCore/html/HTMLPlugInElement.cpp
+++ b/WebCore/html/HTMLPlugInElement.cpp
@@ -56,11 +56,6 @@ HTMLPlugInElement::HTMLPlugInElement(const QualifiedName& tagName, Document* doc
#if ENABLE(NETSCAPE_PLUGIN_API)
, m_NPObject(0)
#endif
-#ifdef ANDROID_FIX
-// addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
-// ensure that m_name is removed from HTMLDocument's NameCountMap
- , oldNameIdCount(0)
-#endif
{
}
diff --git a/WebCore/html/HTMLPlugInElement.h b/WebCore/html/HTMLPlugInElement.h
index 2b8c8ca..1b3d911 100644
--- a/WebCore/html/HTMLPlugInElement.h
+++ b/WebCore/html/HTMLPlugInElement.h
@@ -88,11 +88,6 @@ protected:
#if ENABLE(NETSCAPE_PLUGIN_API)
NPObject* m_NPObject;
#endif
-#ifdef ANDROID_FIX
- // addressing webkit bug, http://bugs.webkit.org/show_bug.cgi?id=16512
- // ensure that m_name is removed from HTMLDocument's NameCountMap
- int oldNameIdCount;
-#endif
};
} // namespace WebCore
generated by cgit v1.1 at 2025-02-13 22:59:42 +0000