[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 12:04:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit be956fc57ba5fee8c8bfcc05eebeb97419aa896f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 13 12:54:41 2010 +0000
2010-08-13 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65204.
http://trac.webkit.org/changeset/65204
https://bugs.webkit.org/show_bug.cgi?id=43965
Caused a lot of test crashes in Chromium (Requested by yutak
on #webkit).
* platform/mac/accessibility/native-vs-nonnative-checkboxes-expected.txt: Removed.
* platform/mac/accessibility/native-vs-nonnative-checkboxes.html: Removed.
2010-08-13 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r65204.
http://trac.webkit.org/changeset/65204
https://bugs.webkit.org/show_bug.cgi?id=43965
Caused a lot of test crashes in Chromium (Requested by yutak
on #webkit).
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::isInputImage):
(WebCore::AccessibilityRenderObject::isNativeCheckboxOrRadio):
* dom/InputElement.h:
* html/HTMLInputElement.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7f6cce8..1f986a2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-13 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65204.
+ http://trac.webkit.org/changeset/65204
+ https://bugs.webkit.org/show_bug.cgi?id=43965
+
+ Caused a lot of test crashes in Chromium (Requested by yutak
+ on #webkit).
+
+ * platform/mac/accessibility/native-vs-nonnative-checkboxes-expected.txt: Removed.
+ * platform/mac/accessibility/native-vs-nonnative-checkboxes.html: Removed.
+
2010-08-13 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/LayoutTests/platform/mac/accessibility/native-vs-nonnative-checkboxes-expected.txt b/LayoutTests/platform/mac/accessibility/native-vs-nonnative-checkboxes-expected.txt
deleted file mode 100644
index 55c57f4..0000000
--- a/LayoutTests/platform/mac/accessibility/native-vs-nonnative-checkboxes-expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-check1
-check2
-check2
-This tests that input types masquerading as checkboxes will use the aria-checked values for its value.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS accessibilityController.focusedElement.intValue is 1
-PASS accessibilityController.focusedElement.intValue is 0
-PASS accessibilityController.focusedElement.intValue is 2
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/mac/accessibility/native-vs-nonnative-checkboxes.html b/LayoutTests/platform/mac/accessibility/native-vs-nonnative-checkboxes.html
deleted file mode 100644
index e3b65ea..0000000
--- a/LayoutTests/platform/mac/accessibility/native-vs-nonnative-checkboxes.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
-<script>
-var successfullyParsed = false;
-</script>
-<script src="../../../fast/js/resources/js-test-pre.js"></script>
-</head>
-<body id="body">
-
-<input type="image" role="checkbox" aria-checked="true" id="check1">check1<BR>
-<input type="image" role="checkbox" aria-checked="mixed" id="check2">check2<BR>
-<input type="image" role="checkbox" id="check3">check2<BR>
-
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
-
- description("This tests that input types masquerading as checkboxes will use the aria-checked values for its value.");
-
- if (window.accessibilityController) {
-
- // aria-state=true
- document.getElementById("check1").focus();
- shouldBe("accessibilityController.focusedElement.intValue", "1");
-
- // aria-state=false
- document.getElementById("check3").focus();
- shouldBe("accessibilityController.focusedElement.intValue", "0");
-
- // aria-state=mixed
- document.getElementById("check2").focus();
- shouldBe("accessibilityController.focusedElement.intValue", "2");
- }
-
- successfullyParsed = true;
-</script>
-
-<script src="../../../fast/js/resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3236c03..ad4e0a6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-13 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r65204.
+ http://trac.webkit.org/changeset/65204
+ https://bugs.webkit.org/show_bug.cgi?id=43965
+
+ Caused a lot of test crashes in Chromium (Requested by yutak
+ on #webkit).
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::isInputImage):
+ (WebCore::AccessibilityRenderObject::isNativeCheckboxOrRadio):
+ * dom/InputElement.h:
+ * html/HTMLInputElement.h:
+
2010-08-13 Anton Muhin <antonm at chromium.org>
Reviewed by Nate Chapin.
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 6b90b63..c4669cd 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -508,9 +508,8 @@ bool AccessibilityRenderObject::isFileUploadButton() const
bool AccessibilityRenderObject::isInputImage() const
{
- Node* elementNode = node();
- if (roleValue() == ButtonRole && elementNode && elementNode->hasTagName(inputTag)) {
- HTMLInputElement* input = static_cast<HTMLInputElement*>(elementNode);
+ if (m_renderer && m_renderer->node() && m_renderer->node()->hasTagName(inputTag)) {
+ HTMLInputElement* input = static_cast<HTMLInputElement*>(m_renderer->node());
return input->inputType() == HTMLInputElement::IMAGE;
}
@@ -592,11 +591,8 @@ bool AccessibilityRenderObject::isIndeterminate() const
bool AccessibilityRenderObject::isNativeCheckboxOrRadio() const
{
Node* elementNode = node();
- if (elementNode && elementNode->isElementNode()) {
- InputElement* input = toInputElement(static_cast<Element*>(elementNode));
- if (input)
- return input->isCheckbox() || input->isRadioButton();
- }
+ if (elementNode && elementNode->isElementNode())
+ return toInputElement(static_cast<Element*>(elementNode));
return false;
}
diff --git a/WebCore/dom/InputElement.h b/WebCore/dom/InputElement.h
index 56fc99d..14cfda2 100644
--- a/WebCore/dom/InputElement.h
+++ b/WebCore/dom/InputElement.h
@@ -43,9 +43,6 @@ public:
virtual bool isPasswordField() const = 0;
virtual bool isSearchField() const = 0;
virtual bool isTextField() const = 0;
- virtual bool isRadioButton() const = 0;
- virtual bool isCheckbox() const = 0;
-
virtual bool supportsMaxLength() const = 0;
virtual bool hasSpinButton() const { return false; }
#if ENABLE(INPUT_SPEECH)
diff --git a/WebCore/html/HTMLInputElement.h b/WebCore/html/HTMLInputElement.h
index 18cbaa4..72ac589 100644
--- a/WebCore/html/HTMLInputElement.h
+++ b/WebCore/html/HTMLInputElement.h
@@ -101,7 +101,6 @@ public:
virtual bool isSearchField() const { return m_type == SEARCH; }
virtual bool isInputTypeHidden() const { return m_type == HIDDEN; }
virtual bool isPasswordField() const { return m_type == PASSWORD; }
- virtual bool isCheckbox() const { return m_type == CHECKBOX; }
bool isTelephoneField() const { return m_type == TELEPHONE; }
bool isNumberField() const { return m_type == NUMBER; }
bool isEmailField() const { return m_type == EMAIL; }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list