Changeset 25010 in webkit

Timestamp:

Aug 11, 2007, 10:18:57 AM (18 years ago)

Author:

darin

Message:

LayoutTests:

Reviewed by Antti.

• test for <rdar://problem/5266535> REGRESSION: <img> inside <map> no longer allowed in strict mode (breaks chemicalelements.com)

• fast/parser/strict-img-in-map-expected.txt: Added.
• fast/parser/strict-img-in-map.html: Added.

WebCore:

Reviewed by Antti.

• fix <rdar://problem/5266535> REGRESSION: <img> inside <map> no longer allowed in strict mode (breaks chemicalelements.com)

Test: fast/parser/strict-img-in-map.html

• html/HTMLMapElement.cpp: (WebCore::HTMLMapElement::checkDTD): Removed FIXME saying this code is strange, since this code matches the HTML 4 specification almost exactly. Made <img> elements allowed even in strict mode and added small comments to clarify what comes from the DTD and what is non-standard.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/parser/strict-img-in-map-expected.txt (added)
• LayoutTests/fast/parser/strict-img-in-map.html (added)
• WebCore/ChangeLog (modified) (2 diffs)
• WebCore/html/HTMLMapElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-08-11  Darin Adler  <darin@apple.com>
+
+        Reviewed by Antti.
+
+        - test for <rdar://problem/5266535> REGRESSION: <img> inside <map> no longer allowed in strict mode
+          (breaks chemicalelements.com)
+
+        * fast/parser/strict-img-in-map-expected.txt: Added.
+        * fast/parser/strict-img-in-map.html: Added.
+
 2007-08-11  Andrew Wellington  <proton@wiretapped.net>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-11  Darin Adler  <darin@apple.com>
+
+        Reviewed by Antti.
+
+        - fix <rdar://problem/5266535> REGRESSION: <img> inside <map> no longer allowed in strict mode
+          (breaks chemicalelements.com)
+
+        Test: fast/parser/strict-img-in-map.html
+
+        * html/HTMLMapElement.cpp: (WebCore::HTMLMapElement::checkDTD): Removed FIXME saying this
+        code is strange, since this code matches the HTML 4 specification almost exactly. Made
+        <img> elements allowed even in strict mode and added small comments to clarify what comes
+        from the DTD and what is non-standard.
+
 2007-08-11  Holger Hans Peter Freyther  <zecke@selfish.org>
 
@@ -4 +18 @@
 
         GdkEventKey::string is not supposed to be used. The length
-        of this string is zero for non ascii charachters. Use the
+        of this string is zero for non ascii characters. Use the
         gdk_unicode_to_keyval to convert the keyval to a UChar and construct
         a String. This change makes it possible to input non ascii
-        charachters.
-
+        characters.
 
         * platform/gdk/KeyEventGdk.cpp:

trunk/WebCore/html/HTMLMapElement.cpp

@@ -1 @@
-/**
- * This file is part of the DOM implementation for KDE.
- *
+/*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -49 +47 @@
 bool HTMLMapElement::checkDTD(const Node* newChild)
 {
-    // FIXME: This seems really odd, allowing only blocks inside map elements.
-    return newChild->hasTagName(areaTag) || newChild->hasTagName(scriptTag) || inBlockTagList(newChild)
-        || (!document()->inStrictMode() && newChild->hasTagName(imgTag));
+    return inBlockTagList(newChild) || newChild->hasTagName(areaTag) // HTML 4 DTD
+        || newChild->hasTagName(scriptTag) || newChild->hasTagName(imgTag); // extensions
 }