Title: [119549] trunk/Source/WebKit/blackberry
- Revision
- 119549
- Author
- commit-qu...@webkit.org
- Date
- 2012-06-05 18:57:53 -0700 (Tue, 05 Jun 2012)
Log Message
[BlackBerry]Differentiate options and group options by TypeOption and TypeOptionInGroup
https://bugs.webkit.org/show_bug.cgi?id=88342
Patch by Crystal Zhang <haizh...@rim.com> on 2012-06-05
Reviewed by Rob Buis.
RIM PR: 163141
Reviewed internally by Mike Fenton.
We set all options' type to TypeOption, which can't tell if an option belongs to a group,
introduce TypeOptionInGroup to fix it.
* WebKitSupport/InputHandler.cpp:
(BlackBerry::WebKit::InputHandler::openSelectPopup):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (119548 => 119549)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-06-06 01:51:08 UTC (rev 119548)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-06-06 01:57:53 UTC (rev 119549)
@@ -1,3 +1,20 @@
+2012-06-05 Crystal Zhang <haizh...@rim.com>
+
+ [BlackBerry]Differentiate options and group options by TypeOption and TypeOptionInGroup
+ https://bugs.webkit.org/show_bug.cgi?id=88342
+
+ Reviewed by Rob Buis.
+
+ RIM PR: 163141
+
+ Reviewed internally by Mike Fenton.
+
+ We set all options' type to TypeOption, which can't tell if an option belongs to a group,
+ introduce TypeOptionInGroup to fix it.
+
+ * WebKitSupport/InputHandler.cpp:
+ (BlackBerry::WebKit::InputHandler::openSelectPopup):
+
2012-06-05 Adam Barth <aba...@webkit.org>
Remove support for target-densitydpi in the viewport meta tag
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (119548 => 119549)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-06-06 01:51:08 UTC (rev 119548)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-06-06 01:57:53 UTC (rev 119549)
@@ -1158,7 +1158,7 @@
labels[i] = option->textIndentedToRespectGroupLabel();
enableds[i] = option->disabled() ? 0 : 1;
selecteds[i] = option->selected();
- itemTypes[i] = TypeOption;
+ itemTypes[i] = option->parentNode() && option->parentNode()->hasTagName(HTMLNames::optgroupTag) ? TypeOptionInGroup : TypeOption;
} else if (listItems[i]->hasTagName(HTMLNames::optgroupTag)) {
HTMLOptGroupElement* optGroup = static_cast<HTMLOptGroupElement*>(listItems[i]);
labels[i] = optGroup->groupLabelText();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
