Title: [124605] trunk
Revision
124605
Author
[email protected]
Date
2012-08-03 06:53:37 -0700 (Fri, 03 Aug 2012)

Log Message

Add keyboard support for color suggestion popup
https://bugs.webkit.org/show_bug.cgi?id=93069

Reviewed by Kent Tamura.

Source/WebCore:

This adds support for keyboard inside the color suggestion popup.
Tab or arrow keys to move around. Return or space to select the color.
Escape closes the popup.

No new tests. Covered in platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html.

* Resources/colorSuggestionPicker.css:
(.color-swatch):
(.color-swatch:focus):
* Resources/colorSuggestionPicker.js:
(ColorPicker):
(ColorPicker.prototype._layout):
(ColorPicker.prototype.selectColorAtIndex): Selects color at index.
(ColorPicker.prototype._handleMouseMove): Set focus to the swatch under the mouse cursor.
(ColorPicker.prototype._handleKeyDown): Move focused element on arrow keys.
(ColorPicker.prototype._handleMouseDown): Prevents blur on click.

LayoutTests:

* platform/chromium-mac/platform/chromium/fast/forms/color/color-suggestion-picker-appearance-expected.png:
* platform/chromium/TestExpectations:
* platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (124604 => 124605)


--- trunk/LayoutTests/ChangeLog	2012-08-03 13:47:30 UTC (rev 124604)
+++ trunk/LayoutTests/ChangeLog	2012-08-03 13:53:37 UTC (rev 124605)
@@ -1,3 +1,14 @@
+2012-08-03  Keishi Hattori  <[email protected]>
+
+        Add keyboard support for color suggestion popup
+        https://bugs.webkit.org/show_bug.cgi?id=93069
+
+        Reviewed by Kent Tamura.
+
+        * platform/chromium-mac/platform/chromium/fast/forms/color/color-suggestion-picker-appearance-expected.png:
+        * platform/chromium/TestExpectations:
+        * platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html:
+
 2012-08-03  Sudarsana Nagineni  <[email protected]>
 
         [EFL] Gardening of failing tests

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (124604 => 124605)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-08-03 13:47:30 UTC (rev 124604)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-08-03 13:53:37 UTC (rev 124605)
@@ -3306,7 +3306,7 @@
 // A few pixels off from the baseline, added by r118567.
 BUGWK87653 WIN LINUX : compositing/geometry/composited-in-columns.html = IMAGE+TEXT
 
-BUGWK92444 : platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html = PASS TEXT
+BUGWK92444 : platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html = PASS TEXT IMAGE
 BUGWK92444 : platform/chromium/fast/forms/color/color-suggestion-picker-one-row-appearance.html = PASS MISSING IMAGE TEXT
 BUGWK92444 : platform/chromium/fast/forms/color/color-suggestion-picker-two-row-appearance.html = PASS MISSING IMAGE TEXT
 

Modified: trunk/LayoutTests/platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html (124604 => 124605)


--- trunk/LayoutTests/platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html	2012-08-03 13:47:30 UTC (rev 124604)
+++ trunk/LayoutTests/platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html	2012-08-03 13:53:37 UTC (rev 124605)
@@ -34,6 +34,13 @@
 var pickerWindow = document.getElementById('mock-page-popup').contentWindow;
 pickerWindow._onresize_ = function() {
     console.log(pickerWindow.pagePopupController);
+    pickerWindow.focus();
+    eventSender.keyDown('downArrow');
+    eventSender.keyDown('downArrow');
+    eventSender.keyDown('downArrow');
+    eventSender.keyDown('leftArrow');
+    eventSender.keyDown('upArrow');
+    eventSender.keyDown('rightArrow');
     setTimeout(function() {testRunner.notifyDone();}, 0);
 }
 </script>

Modified: trunk/LayoutTests/platform/chromium-mac/platform/chromium/fast/forms/color/color-suggestion-picker-appearance-expected.png (124604 => 124605)


--- trunk/LayoutTests/platform/chromium-mac/platform/chromium/fast/forms/color/color-suggestion-picker-appearance-expected.png	2012-08-03 13:47:30 UTC (rev 124604)
+++ trunk/LayoutTests/platform/chromium-mac/platform/chromium/fast/forms/color/color-suggestion-picker-appearance-expected.png	2012-08-03 13:53:37 UTC (rev 124605)
@@ -1,16 +1,11 @@
 \x89PNG
 
 
-IHDR X\x9Av\x82p)tEXtchecksuma668e3f1eeb63d0b19dc280f839e16df,\xC8\xE1\xD2\xC2IDATx\x9C\xED\xDD_\x88\x9Dw\x9D\xC7\xF1\xEF\xFC\xEB\xD4ɟi\x9AҤ\xD9I\xD7M\xB5+m\xA5C\x9B+\xB1\xA6\x9A\xDCX+\x85ި\x8D!-UP\x94\x85RP\x84(\xDC;QJ\xBA\xB2\x98\x8Bb\xE8͊J\xBC5+UlldA\xE9\xD2&f\x94\xACʹ\xD9d'\x9D\xB43s\xFE\xECE\xC9\xEC\xC6f\x9A\xB1s\xE63\x93\x99\xD7\xE4̜|\xF9\xCD$\xCF\xFB<\xCF\xEF<]\xEDv\xBB]\xDD\xBD`\xF9 @\x8Cb#@\x80\x98ޫ\xBD`\xAAѪ\x8B\x93\xAD:7ި\xF1\x89FM5}h\xD6\\xF4\xF5tՊ\xFE\xDEZ\xB3\xA2\xB7\xAE뮾^
-\xC0\xF2\xF1\xAE2\xD5x;<\xFE\xEB\xFCD\xFD\xD7OԹq2W}=]\xB5fEom\xBC\xB1\xBF6\xDE\xD0_kV\xF4\x8A\x96\x8D\xE4R|\x9Cz\xFD\xAD\xFA݉\xD7\xEA\xE5\xD3c\xF5\xDF\xE3S5\xD5h%׷\xE4\xF4\xF5v׍+\xFAj\xEB\xA6\xD5u\xFB\xDE_U׋\x96\x8D\xE4\xE2d\xABN\x9F\x9B\xA8ߝx\xAD\xFE\xF3ԙ\xEA\xEF\xEF\xAFܲ\xA6nX\xB52\xB9\xBE%\xE7\xFC\x857j\xF4\xECX\xFD\xE7\xA93UU\xD5׳\xBE\xFA\xFB\xBAkP\x80\xB0\xCC \xE7\xC6\xF5\x97s\xF5ҟ\xCFW\xFFu\xD7\xD5\xBC\xB9\xB6\xAC_\xF5\xF5t%׷\xE4L5Wԩ\xD1\xD5\xF5\xE2K\xAE\x97\xFE|\xBEn~\xFF`\xADY\xD1W\x83Wݎ׼\x8Fz\xC7'un\xBCQ\xE7ǧ\xEA\xC3\xBF\xB6\xB6\xAC_\xDD\xFEw+]*4G\x97.a;\xFD\xFA`\xFD\xC7ɳӛ\xFB`9\x98yH\xB3]S\xCDvM6Zuê\x95\xD5\xD7\xD3u\xC5\xF8\xE8\xEAZ\xDAgD\xDA\xED\xF7\xB6\xE9\xBE\xD9lVOO\xCF;\xBE\xDE\xD7\xDB]}=]uê\x955\xD9xm\xFA\xF7\xCB\xC1\xACNg\xB4ڭj\xB5Z\xD5l6\xDF\xF1\xA8\xAAj/\xD1GU]\xF1g\xBE\xDAcll\xAC>\xF3\x99\xCF\xD4\xD8\xD8\xD8\xBF\xDFj\xB5\xAAն\x99\x80\xE5gv\xD7S\xB5\xABZ͙d){/\xB2o߾z\xE5\x95Wj߾}W\x90f\xEB\xFF
-\x96\x91Y\xED|n\xB7\xDB\xD5j\xB5\xAA\xD1X~{\xFE֟\xF9\xE7?\xFFy=\xFF\xFC\xF3\xB5r\xE5\xCAz\xFE\xF9\xE7\xEB\xA7?\xFDi\xDDw\xDF}\x97\xBD\xA6\xD5j\xBD\xE7K\xBB\xE0Z6\xBB\xA9v\xB5ڭeq\xC6\xE3\xAF\xFD\xAD?\xF3\xF6\xED\xDB\xEB\x9F\xF8\xC4e\xFF\xAFg\xB4ڭj;\xC024\xABi6\x9A\xF5\xE6\x9Bo\xD6\xF8\xF8\xF2\x90\xF1\xF1\xF1\x8E\xCF|\xF3\xCD\xC9j\xBA\xA1#ː\xCF\xD4\xED\xB0#G\x8E\xD4\xFD\xF7\xDF_;w\xEE\xAC\xFB\x{FFFF}\x8E9\xB2\xD0K\x80EC\x80t\xD8\xF6\xED\xDBkǎ588X;v\xEC\xA8\xED۷/\xF4\x92`ј\xF5\x{DDFB}\xBB\xB4\xCAl4\x9B\xCDڻwo\x9D;w\xAE\xF6\xEE\xDD{\xC5=$o\xFF.]\x82\xC0\xF23\xAB\xE9\xEAꪮ\xAE\x99o:\xB8\x94oE\xF8^n\xB4\xD8\xDF\xDF_\xFB\xF6\x{DAE9}\xA9\xA9f.\xFD8\xC0\x95\xCC }=]ӏ\xB17.\xD6ԺU\xD5lwUO\xD7\xE5\x9F\xDE\xF4ꫯ\xCE\xFB"\xAFE3\xC5G\xB3\xDDUSͪ\xB17.^\xF6;\x80\xE5`\xC6Y\xD1\xDF[kV\xF4\xD6\xE0@o\xBDvn\xACN\xAF\xA8\xAA\xC9\xEA\xEB\xA9r\x8B\x{1E6AEB}j\xAAYu\xFA\x9A\xF5ڹ\xB1x\xFBw\xBC\xA2\xD6W\xC2\xC05m\xC6#\xDF5+z\xEB\xA65\xFD\xB5u\xE3\xEAz\xF9ϯ\xD5\xEFO\xBEZg֬\xAAU+ޗ\ߒsa\xFC\xCDz\xFD܅\x9A\x98\x9C\xAA\xAD\x9B\xDF_7\xAD\xE9\xAF5+\xCBÌG\xBE\xD7uצ5\xFDu\xE7\xD6\xF5\xD5n\xB7\xEBī\xEA\xFA\x9F\x9Aj\x9EO\xAEo\xC9\xE9\xEB\xE9\xAAV\xF4\xD6?ܼ\xAE\xEEܺ\xBE6\xAD鯁\xEBl\xF0`y\xE8j\xB7g\xBE\xA0j\xAAѪ\xFE\x97g\x93\xEB\xE1\xF1O{\\xE8%p
-z\xD7k\xFAz\xDF~g\xDE\xC1&\xFF߷\x9F:\xB4\xD0K\xE0e\xF3\xB3\xD2n\xB7krr\xB2\xDE\xE5\x84\\x95aVZ\xADVMLLT\xAB\xE5\x8A\xBCw\x84Y\xB9t\xA4\xD1h,\xF4R\xB8\x86\xF9\xF8% F\x801\x88\x99\xF3\x90\x91\x91\x91N\xAC\xE3\x86\x86\x86\xCC_\xF3\xA0\x93:\xB2	\xBD\xD3\xAB}P\xBDz\xF5\xEA\x8E\xCE\xBB\xECy\xB3\xD9\xEC\xE8\xFC\x9E\x9E\x9E˞\xBF\xFE\xFA\xEB\x9D\xBFnݺ˞\xBF\xFC\xF2\xCB\x9D\xBFu\xEB֎\xCE\x80K\\x82\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\xBD\x9D222҉13\x9B\xD7\xF9===\xF3:ݺu\xF3:\xEB֭\xF3::e\xCE244ԉu\x98\xBFH\xE7@'\xB9\x88\x99\xF3\x90\xF9\xBA\xFC\xEA\xD2;\xFB\xE6/\xEC|褎\xEC\xF9\xCDo~Ӊ1ӆ\x87\x87/{~\xF8\xF0\xE1\x8E\xCE߱c\xC7eϟy晎\xCE衇.{\xFE\xBD\xEF}\xAF\xA3\xF3}\xF4\xD1˞\xF3\x9B\xDF\xEC\xE8\xFC'\x9Ex\xA2\xA3\xF3\xE0\x97`1\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @Lo'\x86wb̌v\xEC\xD81\xAF\xF3z\xE8\xA1y\x9D\xFF裏\xCE\xEB\xFC'\x9Exb^\xE7@\xA7\xCC9@\x86\x86\x86:\xB1\xF3\xE9|\xE8$\x97`1s>222҉u\xBCåw\xF6\xCD_\xD8\xF9\xD0I\xD9\xF2կ~\xB5c\xA6\xED߿\xFF\xB2\xE7\xBBw\xEF\xEE\xE8\xFC\\xF6\xFC\x81\xE8\xE8\xFCg\x9F}\xF6\xB2\xE7\xFB\xD8\xC7::\xFFȑ#\x97=\xBF\xE3\x8E;::\xFF\xF8\xF1\xE3\x9D\x97\xB8\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cbz;1d\xFF\xFE\xFD\x9D3\xA3\xCC\xEB\xFCg\x9F}v^\xE79rd^\xE7?~|^\xE7@\xA7\xCC9@\x86\x86\x86:\xB1\xF3\xE9|\xE8$\x97`1s>222҉u\xBC\x83w\xF6`\xE9\xE9\xC8\x90-[\xB6tb̴S\xA7Nut\xB08\xB8\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cbz;1\xE4ԩS\x9D,qs\x90\xA1\xA1\xA1N\xACX\\x82\xC4 F\x801\x88\x99\xF3&\xF4\xD1\xD1\xD1\xA9\xBF\xFC\xE5/5>>މ5\xB1@V\xACXQ7\xDDtS
+IHDR X\x9Av\x82p)tEXtchecksum48488bf57db12cc35b115116addfce6b\x8B\x8A\xBD\xC3IDATx\x9C\xED\xDD_hՇ\xDD\xC7\xF1o\xFE\xB8J\xEA\xB4U	\xD6N\xA2\xDDz3\xD6\xA5\xCA.\xC6:\xEB\xA0z\xB3\xAER\xE8Ͷ:\xB1\xA5llJac\xE0Ɛ]\x8E\x8Db\xF3\xA2Tz\xF3\x8Cm\xB8\xE9|J;\xD0֫\x8D\xC1\x9A\xD4l\x84ڰL\xD1)jO\xCEy.J|g\xD3d\xCD/\x9F\x93\xD7=\xE6痯ڋ\xF3\xCE\xEF\xCF\xE9\xE9t:\x9D\xE8\xED\xF6\xC0\xD2!@\x80\xC4 F\x801\x88 @L\xFFl\xAF\xD1\xD1\xD1z\xE7\x9Dw\xEAҥK\xF3\xBDӢv\xFB\xED\xB7\xD7]w\xDDUCCC588\xD8\xEDu \xAAg\xA6"\xAF\x93'O\xD6\xEAի\xEB\x9E{\xEE\xF1\xA6y\x8E\xC6\xC7\xC7kxx\xB8\xFE\xF9\xCF\xD6֭[\xFD}\xB0\xA4\xCC \xAF\xBF\xFEzMNN\xD6g?\xFB\xD9\xD4NK«\xAF\xBEZ}}}\xB5}\xFB\xF6n\xAF13\xDE266V[\xB6lI첤lٲ\xA5\xC6\xC6ƺ\xBDD\xCDx\xC8ŋ?\xF42\xA1\x9E\x9E\x9EFZhf8A4\xAD\xC9\xC9\xC9\xEA\xEB\xEB\x9B\xF6\xFB\x83\x83\x83u\xF1\xE2ŏ\xBAܒf<\xD2n\xB7krrrگ\xAA\xAA\xCE"\xFD\xAA\xAA\xFD\xB3O\xF7u\xE1…\xFA\xCAW\xBER.\\xF8\xD0\xE3\xDA\xED\xF6,\xFF\x99`q\x98\xD5cx;\x9D·\xC8b\xF6Q\xE4\xE0\xC1\x83\xF5\xD6[o\xD5\xC1\x83\xA7=棞Y\x80[٬\xC3;ud)\xBEin\xB5Z\xFF\xD1\xF1\xBF\xFF\xFD\xEF\xEB\xB5\xD7^\xAB+V\xD4k\xAF\xBDV\xBF\xFD\xEDo\xEB\xE1\x87\xBE\xE1\x98\xC5~\xD9Lg\xD62\xF5\xB5\xD4\xFC\xA7gyv\xEE\xDCY_\xFC\xE2o\xF8\xFD\xFF>\xA3\xB7\xB7W\x84\xB0$\xCD*@\xAE^\xBDZW\xAE\Y\x92g@\xE6\xE3\x83{zzj\xF9\xF2\xE5\x8D\xCF\x80\x85nV\xF7\x800{Ǐ\xAFGy\xA4v\xEF\xDE]\x8F<\xF2H?~\xBC\xDB+\xC0\x82!@\xB6s\xE7\xCEڵkW\xADZ\xB5\xAAv\xED\xDAU;w\xEE\xEC\xF6J\xB0`\xCC\xEA\xAC\xAA\xF7\xEF[X
+O\xBD\x9A\xAB\xC9\xC9\xC9:p\xE0@\x9D;w\xAE8\xF0\x81g\xBD\xBD\xBA\x80\xA5iV2u\xD3\xF4t7N/\xE6۩?\xCA\xCD\xE2\xB7\xDDv[<x\xB0\xDE{\xEF\xBDig\x8A\x96\xA2d``\xA0&&&jŊ\xD5\xDB\xDB{ӓ\xB0Ξ=;o\xCB\xDDʦ\x8B\x8F\xA9𘘘\xA8\x81\x81\x81\xE4J\xD0u3\xC8\xFA\xF5\xEBkdd\xA4\xEE\xBF\xFF\xFEj\xB5Z\xD5\xD7׷$\x9F\x86Մ\xA9\xB3)\xFD\xFD\xFD522R\xEBׯ\xEF\xF2F\x90\xD5ә\xA1&FGG\xEB\x8D7ި;6m\xDATw\xDEygj\xB7E\xE9ܹs\xF5\xF6\xDBo\xD7\xF9\xF3\xE7\xEB\x81\xA8\xA1\xA1\xA1n\xAF13H\xABժ\xBF\xFF\xFD\xEFu\xE6̙:{\xF6l]\xBE|9\xB5ۢ400P\xEB֭\xAB\x8D7ֆ
+\xAA\xBF\xD6\xCF\x80[ތ\xF2\x93珦v\xE1\xF2\xBD\xFD\x8Fu{nA\xB3\xFA\xF1\xBB7\x9B\xFC\xA2\x80\x8F\xCA\xF5?\xCCJ\xA7өk׮ys"@\x98\x95v\xBB]W\xAF^\xBD\xE91\xCC\xF0\x9F \xCC\xCA\xD4\x90V\xAB\xD5\xEDU\xB8\x85\xF98n F\x801\x88\x99\xF3= \xA3\xA3\xA3M\xECq\x93\xA9O7\xBF\xBB\xF3\xA0I\x8D܄\xDE\xF4\x9B\xD5S\xBDr\xE5\xCAF\xE7_\xB8p\xE1\x86ד\x93\x93\x8D\xCE\xEF\xEB\xEB\xBB\xE1\xF5?\xFE\xF1\x8FF\xE7\xAF]\xBB\xF6\x86\xD7\xFD\xEB_\x9D\xBFy\xF3\xE6F\xE7\xC0\x97`1\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @LCFGG\x9B3\xAD.\xCC\xEB\xFC\xBE\xBE\xBEy\x9D\xBFv\xED\xDAy\x9D\xBFy\xF3\xE6y\x9DM\x99s\x80
 
-
-\xD5\xFA\xF5\xEBz9,As
-\x90\xD1\xD1\xD1z\xE1\x85\xEA\xC6o\xAC\xBB\xEF\xBE\xDBA\xEB5ntt\xB4N\x9C8Q/\xBC\xF0B\xDDu\xD7]\xFE=\xE8\xB89]\x82u\xE2ĉ\xAC{\xEE\xB9\xC7\xC1\xEA\xB0~\xFD\xFA\xBA\xE7\x9E{jpp\xB0N\x9C8\xB1\xD0\xCB`	\x9AS\x80\x9C>}\xBAn\xBD\xF5\xD6N\xAD\x85E\xE2\xD6[o\xADӧO/\xF42X\x82\xE6 .\\xB8&\xCE|\xB4\xDB\xED:y\xF2d\x9D?\xFE\xAA\xAF\xFD\xE1XǏ\xACj\xF1Z\xBF~}]\xB8pa\xA1\x97\xC04\xA7= \xADV\xAB\x9A\xCDf\xA7\xD62/<X_\xFB\xDA\xD7\xEA\xB6\xDBn\xAB\xD1\xD1\xD1\xAC\xFC\xE0u\xF3\xCD7O\xBF\xA6\xD5jUw\xF7\xDB-v\xE8Сj\xB5Z\xF5\xE1x\xA1\x96\xBC(\xB4Z\xAD\x85^KМ?\xAB\xDDn/ڃգG\x8F֗\xBE\xF4\xA5\xFAկ~U\xB7\xDCrKUU}\xFD\xEB_\xAFO}\xEAS\xF5\xCB_\xFE\xB2\xBA\xBA\xBAj\xF7\xEE\xDD5<<\{\xF6쩪\xFF\xFBy{XͧK1\x9D6\xE7\xB9t\xB0\xDEn\xB7;\xB1\x9E\x8E\xFA\xCEw\xBES\xF7\xDE{om޼\xB9\x8DFUU}\x{1B37ED}o}\xEB[u\xE4ȑ\xAF\x9F\xFC\xE4'\xF5\xDCs\xCFաC\x87\xEAg?\xFBY\xB5\xDB\xED\xAD\x9D;w\xD6\xEF\xFF\xFB\xFA\xC2\xBEP_\xFC\xE2\xAB\xAA\xEA\xF0\xE1\xC3\xF5\xE4\x93O\xD6\xEAիk\xEF޽\xF5\xE0\x83VU\xD5\xE3\x8F?^\xB7\xDDv[:t\xA8>\xFE\xF1\x8FדO>\xB9`?\xF3\uuu-\xF4X\xC2: \x97\x8B\xCDK/\xBDT_\xF9\xCAW.;\x9B\xB1aÆ\xFAЇ>T\xF8\xC3jϞ=u\xEF\xBD\xF7ֶm\xDB\xEA\x91G\x99\xA9\xA7\x9Ez\xAA<X\xD7_}}\xF4\xA3\xAD\xCF\xFE\xF3\xD5\xD7\xD7W_\xFE\xF2\x97\xEB\xF0\xE1õjժ\xAE\x9D;w\xD6u\xD7]WgΜ\xA9cǎ\xD53\xCF<S\x9B7o\xBE\xA6Ϟtww\x8B\xE6͜dbb\xA2\xDEz\xEB\xADEy\xA4\xD5j\xD5[o\xBD\xF5\x8E$6\x8D\x9A\x9A\x9A\xAA\xF1\xF1\xF1j45999\xFD\x9Af\xB3Y\x8F?\xFE\xF8\xF4%[/^\xAC3g\xCEԉ'\xEA\x8D7ި\xFD\xFB\xF7O\xBF\xEE\xBF\xF8Em۶\xAD\x9A\xCDf\xED޽\xBBn\xBC\xF1\xC6k\xFEf\x8C]]]u\xFD\xF5\xD7/\xF42X\xA2\xE6 \x8B\xD9?\xF8\xC1:z\xF4h=\xFC\xF0\xC3\xD3_;}\xFAt\xBD\xF2\xCA+\xB5u\xEB\xD6\xFF^__\xDF\xF4\x9F/\x9D
-\xAD\x81\x81\x81ڵkWUU\xEDڵ\xAB>\xF0\x81L\xBFξ	\xB8\xBA%}\xD4\xFC\xD8c\x8F\xD5ѣG\xEBO\xFA\xD3\xF4\xD7<X\xB7\xDF~{m۶\xAD\xAA\xAAn\xB8\xE1\x86\xBDꬻΞ=[\xDD\xDD\xDD5<<\\xC3\xC3õv\xED\xDA+\xBE\xF6…\xF5\xE3\xFFx\xFAlȱc\xC7\xEA\xC5_\xBC\xE2\xF7`9\xE9H\x80,\xD6w\xFF\xEF\xBE\xFB\xEE\xFA\xC67\xBEQ\x9F\xFC\xE4'\xEB\xE1\x87\xAE\xFB\x8E;VO?\xFD\xF4\xF4\x99\x8Dx\xA0:T\x8F=\xF6ػ\xCEZ\xBF~}}\xF7\xBB߭\xCF}\xEEs\xB5k׮ڱcG=\xF7\xDCsW|\xED\xE9ӧkϞ=\xF5ꫯVU\xD5\xF7\xBF\xFF\xFD:p\xE0\xC0\xBF\xB7\xD8,\xD6K\x96\x86\xAE\xF6U6o|\xFB\xA9C\xF5O{\xBC\xE2\xF7\x9E~\xFA\xE9\xFA\xF4\xA7?]\x8Bz\xE3u\xABժ\x91\x91\x91Z\xBBvm\xAD^\xBD\xFA\xDFo45>>^\x83\x83\x83W\x9D\xD5n\xB7\xEB\xECٳ\xB5v\xED\xDA%\xB9Y\xBB\xA7\xA7\xA7\xFA\xFB\xFB\xEBG?\xFAQ=\xF2\xC8#\xD3_o4u\xFE\xFC\xF9j4\xF5\xAF\xFF\xF6\xEF3\xFE\x9F\x80w3\xA7= u\xF6\xEC\xD9Z\xB9reuww/\xCAOªz\xFB]\xFDK\x9Bʯ\xA4\xB7\xB7wV\xF1Q\xF5\xF6\x9E\x90u\xEB\xD6uji\x8Bʥ\xB3gϞ\xAD\x81\x81\x81^
-Kќd\xE3ƍu\xF2\xE4ɺ\xF3\xCE;\xAB\xD1hTOOϢ\xFC4,\xAE\xEE\xD2ٜ\xDE\xDE\xDE:y\xF2dmܸq\x81W\xC0R4\xA7ٲeK\xFD\x{1B7FED}_|\xB1n\xB9\xE5\x96Z\xB3fM\xA7\xD6\xC58w\xEE\\xFD\xF1\x8F\xAC\xF3\xE7\xCF\xD7G>\xF2\x91\x85^KМdӦM\xD5j\xB5\xEAԩS\xF5\xEB_\xFF\xBA.^\xBCةu\xB1jÆ
-u\xC7wԦM\x9Bz9,As
-\x90\xDE\xDE\xDEڼysmذ\xA1\x8DƢ\xDD\xC2\xECtwwWooo\xF5\xF5\xF5UoEd\xCEG\x99\xBD\xBD\xBDV\x80Yq\xD3 f֧.\xDA\xEDv\xB5Z-\x9Fr\xB5L\xB5Z-\x97\xD80g\xB3\x90\xC9\xC9ɚ\x98\x98\xA8\xC9\xC9\xC9\xF9\\x8B\x94\xF8\xA0\xFE\xE63 \x8DFc>\xD7,a\xB3
-\x90o?uh\xBE\xD7,]m\xD7\xD5!>\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88\xF9_o\xED\xC6\xBCY\x85IEND\xAEB`\x82
\ No newline at end of file
+5\xB1\x87\xF9t>4\xC9%X@̜π\xF4\xF4\xF44\xB1\xC7M:\x9DNU\xCD\xDF\xE5]Sg\xCC\xFF\xF0\xF9ФF\xEEy饗\x9As\xDD޽{ox}\xECرF\xE7\xEFڵ\xEB\x86\xD7/\xBE\xF8b\xA3\xF3\xFC\xF1^\xFF\xFC\xE7?ot\xFESO=u\xC3\xEB\xFD\xE8G\x8D\xCE\xF6\xD9g\x9DS\\x82\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\xFDMٻwoc\xA6\xB5k׮y\x9D\xFF\xF8\xE3\x8F\xCF\xEB\xFC\xA7\x9Ezj^\xE7?\xFB\xEC\xB3\xF3:\x9A2\xE7\xE9t:M\xEC1\xAD\xA1\xA1!\xF3\xBB8\x9A\xE4, f\xCEg@FGG\x9B\xD8\xE3&S?\xD97\xBF\xBB\xF3\xA0I\x8D\xDC\xF2\xDD\xEF~\xB7\x891\xD7:t\xE8\x86\xD7\xFB\xF6\xEDkt\xFE\xE1Çox\xFD裏6:\xFF\xE5\x97_\xBE\xE1\xF5\xE7?\xFF\xF9F\xE7?~\xFC\x86\xD7\xF7\xDDw_\xA3\xF3O\x9F>\xDD\xE8<\x98\xE2, F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88\xE9obȡC\x87\x9A3\xADÇ\xCF\xEB\xFC\x97_~y^\xE7?~|^\xE7\x9F>}z^\xE7@S\xE6 CCCM\xECa\xFE\x9DMr	3\xE73 \xA3\xA3\xA3M\xECq?\xD9\x80ŧ\x91{@6n\xDC\xD8Ę\xEBΜ9\xD3\xE8<`ap	#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4\xF471\xE4̙3M\x8C\xB99\xC8\xD0\xD0P{K\x80K\xB0\x80\xC4 F\x801s\xBE	}||\xBCFGG\xEB\x9DwީK\x97.5\xB1]r\xFB\xED\xB7\xD7]w\xDDUCCC588\xD8\xEDuX\x84\xE6 \xE3\xE3\xE3u\xF2\xE4\xC9Z\xBDzu=\xF8\xE0\x83޴\xDE\xE2\xC6\xC7\xC7kxx\xB8N\x9E<Y[\xB7n\xF5\xEF	@\xE3\xE6t	\xD6\xF0\xF0p\xADZ\xB5\xAA\xB6o\xDF\xEE\xCD\xEA"088X۷o\xAFU\xABV\xD5\xF0\xF0p\xB7\xD7`\x9AS\x80\x8C\x8D\x8DՖ-[\x9Aڅb˖-566\xD6\xED5X\x84\xE6 /^\xBC%\xCE|t:\x9D\xA9\xF3\xE7\xCF\xCFx\xEC\xAF~\xF5\xAB:}\xFAt`\xAB\x85kpp\xB0.^\xBC\xD8\xED5X\x84\xE6tH\xBBݮ\xC9\xC9ɦv\x99G\x8E\xA9\xEF\xFF\xFBu\xEF\xBD\xF7\xD6\xF8\xF8x\xADZ\xB5\xAA~\xF9\xCB_\xD6'>\xF1\x89\xEBǴ\xDB\xED\xEA\xED}\xBFŎ=Z\xEDv\xBB>\xFD\xE9Owk\xE5\xA1\xDDnw{\xA19?\xAB\xD3\xE9,\xD87\xAB'N\x9C\xA8o}\xEB[\xF5\xFA\xEB\xAFצM\x9B\xAA\xAA\xEA?\xF8A}\xF9\xCB_\xAEW_}\xB5zzzj߾}\xB5m۶ڿU\xFDߟg\xA1\x87\xD5|\x9A\x8A1hڜd\xEA\xCDz\xA7\xD3ib\x9FF\xFD\xF4\xA7?\xAD\x87z\xA86l\xD8P\xADV\xAB\xAA\xAA\xBE\xFAկ֏\xFC\xE3:~\xFCx]\xBAt\xA9~\xF3\x9B\xDF\xD4+\xAF\xBCRG\x8F\xAD\xDF\xFD\xEEw\xD5\xE9tj||\xBCv\xEF\xDE]\xFAӟ\xEA\xDF\xF8F}\xF3\x9B߬\xAA\xAAcǎ\xD5s\xCF=W+W\xAE\xAC\xD4c\x8F=VUU\xCF<\xF3L\xDD{\xEF\xBDu\xF4\xE8\xD1\xFA\xC2\xBEP\xCF=\xF7\\xD7\xFE\xCCs\xD5\xD3\xD3\xD3\xEDX\xC4	\x90\xA9\xAF\x85\xE6/\xF9K}\xE7;߹\xE1lƺu\xEB\xEAS\x9F\xFAT\xFD\xF9\xCF\xAE\xFD\xFB\xF7\xD7C=T;v\xEC\xA8'\x9F|\xF2zH=\xFF\xFC\xF3u\xE4ȑZ\xBE|y}\xEEs\x9F\xAB\xAF\xFD\xEB\xB5lٲ\xFA\xF6\xB7\xBF]ǎ\xAB\x8F\xFC\xE3\xB5m۶ڽ{w}\xECc\xABw\xDF}\xB7N\x9D:U/\xBE\xF8bmذ\xE1\x96>{\xD2\xDB\xDB+B\x987s\x90\xABW\xAF֕+W\xE4\x90v\xBB]W\xAE\\xB9\xE9[\xADV\xBD\xF7\xDE{u\xE9ҥj\xB5Zu\xEDڵ\xEB\xC7LNN\xD63\xCF<s\xFD\x92\xAD˗/׻\xEF\xBE[\xC3\xC3\xC3\xF5\xAF\xFD\xAB:t\xFD\xB8?\xFC\xE1\xB5cǎ\x9A\x9C\x9C\xAC}\xFB\xF6\xD5\xEAիo\xF9c\xEC\xE9\xE9\xA9\xE5˗w{
+\xA99\xC8B\xF6\xC9O~\xB2N\x9C8QO<\xF1\xC4\xF5_\xAB\xB7\xDEz\xAB6o\xDE<\xED\xEF[\xB6l\xD9\xF5\xFF\x9E:0>>^\xB5gϞ\xAA\xAAڳgO\xDDs\xCF=׏s\xDF\xCClQ\xBFk~\xFA\xE9\xA7\xEBĉ\xF5\xB7\xBF\xFD\xED\xFA\xAF9r\xA4>\xF3\x99\xCFԎ;\xAA\xAA\xEA\x8E;\xEE\xA8\xF1\xF1\xF1gmݺ\xB5&&&\xAA\xB7\xB7\xB7\xB6m\xDBV۶m\xAB5k\xD6|\xE0\xB1/^\xAC_\xFF\xFA\xD7\xD7φ\x9C:u\xAA\xDE|\xF3\xCD\xFC,%\x8D\xC8B\xFD\xE9\xFF\x83>X?\xFC\xE1\xEBK_\xFAR=\xF1\xC4\xF5\xF0\xC3שS\xA7\xEA\x85^\xB8~f\xE3\xD1G\xAD\xA3G\x8F\xD6\xD3O?\xFD\xA1\xB3\xEBg?\xFBY}\xEDk_\xAB={\xF6Ԯ]\xBB\xEA\x95W^\xF9\xC0c\xC7\xC6\xC6j\xFF\xFE\xFDu\xF6\xEC٪\xAA\xFA\xC5/~Q\x87\xFE\xC0\xEF-4\xF5\xDF\x80š\xA73\xC3\xCD?y\xFEh}o\xFFc\xF8\xBD^x\xA1\xF6\xEE\xDD[W\xAF^]\xD07^\xB7\xDB\xED\xAD5k\xD6\xD4ʕ+o\xFA~\xABժK\x97.ժU\xABf\x9C\xD5\xE9tjbb\xA2֬Y\xB3(o\xD6\xEE\xEB\xEB\xAB\xDBn\xBB\xAD^z\xE9\xA5z\xF2\xC9'\xAF\xFFz\xABժ\xF3\xE7\xCFW\xABժ\xFF\xFA\xEF\xFF\x99\xF6\xFF	\xF80s\xBAd``\xA0&&&jŊ\xD5\xDBۻ \x9F\x84U\xF5\xFEO\xF5\xA7n*\xFF \xFD\xFD\xFD\xB3\x8A\x8F\xAA\xF7\xEF	Y\xBBvmS\xAB-(Sg?&&&j``\xA0\xCB\xDB\xB0\xCD)@֯__###u\xFF\xFD\xF7W\xABժ\xBE\xBE\xBE\xF94,f6u6\xA7\xBF\xBF\xBFFFFj\xFD\xFA\xF5]\xDE\x80\xC5hN\xB2q\xE3\xC6z\xE3\x8D7\xEA\xCD7߬M\x9B6՝w\xDE\xD9\xD4^t\xC1\xB9s\xE7\xEA\xED\xB7߮\xF3\xE7\xCF\xD7<\xD0\xEDuX\x84\xE6 w\xDF}w\xB5\xDB\xED:s\xE6L\xFD\xF1\x8F\xAC˗/7\xB5]000P\xEB֭\xAB\xFB\xEE\xBE\xFB\xEEn\xAF\xC0"4\xA7\xE9\xEF\xEF\xAF
+6Ժu\xEB\xAA\xD5j-\xD8{@\x98\x9D\xDE\xDE\xDE\xEA\xEF\xEF\xAFe˖U\xFF\xA2\xFE\x88\xBAd\xCE\xEF2\xFB\xFB\xFB\xBDYfŇ>1\xB3>u\xD1\xE9t\xAA\xDDn{\xCA\xD5\xD5n\xB7]b\xC0\x9C\xCD:@\xAE]\xBBVW\xAF^\xADk׮\xCD\xE7>,P\xE2\x80&\xFC\xC7g@Z\xAD\xD6|\xEE,b\xB3
+\x90\x9F<t\xBE\xF7\x96\x80\x9E\x8E\xEBj\x80O\xC1b#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb#@\x80\xC4 F\x801\x88 @\x8Cb\xFE'\xE8u\xEA\xF4\xA70cIEND\xAEB`\x82
\ No newline at end of file

Modified: trunk/Source/WebCore/ChangeLog (124604 => 124605)


--- trunk/Source/WebCore/ChangeLog	2012-08-03 13:47:30 UTC (rev 124604)
+++ trunk/Source/WebCore/ChangeLog	2012-08-03 13:53:37 UTC (rev 124605)
@@ -1,3 +1,27 @@
+2012-08-03  Keishi Hattori  <[email protected]>
+
+        Add keyboard support for color suggestion popup
+        https://bugs.webkit.org/show_bug.cgi?id=93069
+
+        Reviewed by Kent Tamura.
+
+        This adds support for keyboard inside the color suggestion popup.
+        Tab or arrow keys to move around. Return or space to select the color.
+        Escape closes the popup.
+
+        No new tests. Covered in platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html.
+
+        * Resources/colorSuggestionPicker.css:
+        (.color-swatch):
+        (.color-swatch:focus):
+        * Resources/colorSuggestionPicker.js:
+        (ColorPicker):
+        (ColorPicker.prototype._layout):
+        (ColorPicker.prototype.selectColorAtIndex): Selects color at index.
+        (ColorPicker.prototype._handleMouseMove): Set focus to the swatch under the mouse cursor.
+        (ColorPicker.prototype._handleKeyDown): Move focused element on arrow keys.
+        (ColorPicker.prototype._handleMouseDown): Prevents blur on click.
+
 2012-08-03  Tor Arne Vestbø  <[email protected]>
 
         Add missing include to build on Mac OS 10.8

Modified: trunk/Source/WebCore/Resources/colorSuggestionPicker.css (124604 => 124605)


--- trunk/Source/WebCore/Resources/colorSuggestionPicker.css	2012-08-03 13:47:30 UTC (rev 124604)
+++ trunk/Source/WebCore/Resources/colorSuggestionPicker.css	2012-08-03 13:53:37 UTC (rev 124605)
@@ -44,12 +44,14 @@
     width: 20px;
     height: 20px;
     margin: 1px;
+    padding: 0;
     border: 1px solid #e0e0e0;
+    box-sizing: content-box;
 }
 
-.color-swatch:hover {
+.color-swatch:focus {
     border: 1px solid #000000;
-    margin: 1px;
+    outline: none;
 }
 
 .color-swatch-container {

Modified: trunk/Source/WebCore/Resources/colorSuggestionPicker.js (124604 => 124605)


--- trunk/Source/WebCore/Resources/colorSuggestionPicker.js	2012-08-03 13:47:30 UTC (rev 124604)
+++ trunk/Source/WebCore/Resources/colorSuggestionPicker.js	2012-08-03 13:53:37 UTC (rev 124605)
@@ -144,7 +144,11 @@
     this._config = config;
     if (this._config.values.length === 0)
         this._config.values = DefaultColorPalette;
+    this._container = null;
     this._layout();
+    document.body.addEventListener("keydown", bind(this._handleKeyDown, this));
+    this._element.addEventListener("mousemove", bind(this._handleMouseMove, this));
+    this._element.addEventListener("mousedown", bind(this._handleMouseDown, this));
 }
 
 var SwatchBorderBoxWidth = 24; // keep in sync with CSS
@@ -156,7 +160,8 @@
     var container = createElement("div", "color-swatch-container");
     container.addEventListener("click", bind(this._handleSwatchClick, this), false);
     for (var i = 0; i < this._config.values.length; ++i) {
-        var swatch = createElement("div", "color-swatch");
+        var swatch = createElement("button", "color-swatch");
+        swatch.dataset.index = i;
         swatch.dataset.value = this._config.values[i];
         swatch.title = this._config.values[i];
         swatch.style.backgroundColor = this._config.values[i];
@@ -171,6 +176,8 @@
     var otherButton = createElement("button", "other-color", this._config.otherColorLabel);
     otherButton.addEventListener("click", chooseOtherColor, false);
     this._element.appendChild(otherButton);
+    this._container = container;
+    this._otherButton = otherButton;
     var elementWidth = this._element.offsetWidth;
     var elementHeight = this._element.offsetHeight;
     if (window.frameElement) {
@@ -181,6 +188,59 @@
     }
 };
 
+ColorPicker.prototype.selectColorAtIndex = function(index) {
+    index = Math.max(Math.min(this._container.childNodes.length - 1, index), 0);
+    this._container.childNodes[index].focus();
+};
+
+ColorPicker.prototype._handleMouseMove = function(event) {
+    if (event.target.classList.contains("color-swatch"))
+        event.target.focus();
+};
+
+ColorPicker.prototype._handleMouseDown = function(event) {
+    // Prevent blur.
+    if (event.target.classList.contains("color-swatch"))
+        event.preventDefault();
+};
+
+ColorPicker.prototype._handleKeyDown = function(event) {
+    var key = event.keyIdentifier;
+    if (key === "U+001B") // ESC
+        handleCancel();
+    else if (key == "Left" || key == "Up" || key == "Right" || key == "Down") {
+        var selectedElement = document.activeElement;
+        var index = 0;
+        if (selectedElement.classList.contains("other-color")) {
+            if (key != "Right" && key != "Up")
+                return;
+            index = this._container.childNodes.length - 1;
+        } else if (selectedElement.classList.contains("color-swatch")) {
+            index = parseInt(selectedElement.dataset.index, 10);
+            switch (key) {
+            case "Left":
+                index--;
+                break;
+            case "Right":
+                index++;
+                break;
+            case "Up":
+                index -= SwatchesPerRow;
+                break;
+            case "Down":
+                index += SwatchesPerRow;
+                break;
+            }
+            if (index > this._container.childNodes.length - 1) {
+                this._otherButton.focus();
+                return;
+            }
+        }
+        this.selectColorAtIndex(index);
+    }
+    event.preventDefault();
+};
+
 ColorPicker.prototype._handleSwatchClick = function(event) {
     if (event.target.classList.contains("color-swatch"))
         submitValue(event.target.dataset.value);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to