[webkit-changes] [140771] branches/chromium/1364

Thu, 24 Jan 2013 20:08:32 -0800

Title: [140771] branches/chromium/1364
Revision
140771
Author
[email protected]
Date
2013-01-24 20:10:16 -0800 (Thu, 24 Jan 2013)

Log Message

Merge 140525
> REGRESSION(r139044): Pan icon remains on screen on Chromium-WinXP
> https://bugs.webkit.org/show_bug.cgi?id=107623
> 
> Reviewed by Hajime Morita.
> 
> Source/WebCore:
> 
> The issue is caused by AutoscrollController::stopAutoscrollTimer()
> doesn't call View::removePanScrollIcon() because m_autoscrollType
> is reset before checking it.
> 
> This patch changes to reset m_autoscrollType after all references.
> 
> Test: platform/chromium-win/fast/events/panScroll-panIcon.html
> 
> * page/AutoscrollController.cpp:
> (WebCore::AutoscrollController::stopAutoscrollTimer):
> 
> LayoutTests:
> 
> This test checks no pan icon after pan scroll.
> 
> * platform/chromium-win/fast/events/panScroll-panIcon-expected.png: Added.
> * platform/chromium-win/fast/events/panScroll-panIcon-expected.txt: Added.
> * platform/chromium-win/fast/events/panScroll-panIcon.html: Added.
> * platform/chromium/TestExpectations: Changed to skip entry for panScroll-panIcon.html for Android, Linux and Mac.
> 

[email protected]

Modified Paths

Added Paths

Diff

Modified: branches/chromium/1364/LayoutTests/platform/chromium/TestExpectations (140770 => 140771)


--- branches/chromium/1364/LayoutTests/platform/chromium/TestExpectations	2013-01-25 04:06:12 UTC (rev 140770)
+++ branches/chromium/1364/LayoutTests/platform/chromium/TestExpectations	2013-01-25 04:10:16 UTC (rev 140771)
@@ -2071,6 +2071,7 @@
 
 webkit.org/b/107205 [ Android Linux Mac ] platform/chromium-win/fast/events/panScroll-click.html [ Skip ]
 webkit.org/b/107205 [ Android Linux Mac ] platform/chromium-win/fast/events/panScroll-drag.html [ Skip ]
+webkit.org/b/107623 [ Android Linux Mac ] platform/chromium-win/fast/events/panScroll-panIcon.html [ Skip ]
 
 crbug.com/31623 [ SnowLeopard Win ] http/tests/appcache/remove-cache.html [ Failure Pass Timeout ]

Copied: branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon-expected.png (from rev 140525, trunk/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon-expected.png) (0 => 140771)


--- branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon-expected.png	                        (rev 0)
+++ branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon-expected.png	2013-01-25 04:10:16 UTC (rev 140771)
@@ -0,0 +1,37 @@
+\x89PNG
+
+
+IHDR X')tEXtchecksum6573a3bcf198926a0cab186476f9a757\xE4\xFF\xF1{\xFDIDATx\x9C\xED\xDDK\xB6\xAB\xB6\xA2P\xFB\x8D\xF4(\xD5\xF4+mH\xBFRL\xDA\xC4+\xF8n\xC7}\xB0ll<g!c\x83\xC3:\x86\xEB4Mr\xFE\xEF\xE8
+\x9C\x8D\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84\xFD\xD6\xF9\xECz\xBD\xDE\xFF\xBE\xBD\xB2\xB0\x9C\x92r\xBD^w\xD8*aɛ\xD7\xFE\x9AUoX\xE3\xE3~\xBC{\\xB0\x9C\xA1\xFFiu6\xF8Z\xBD\x80uU\xF7\xAB\xE64M\xCF
+\x9D\xF6\xCE\xF6\x97\xBCg\xED\xAFO\x83k,\xF7\xEC\xA5\xD8ѳ)\xB3\x99\xAB\xD3_\xD3\xDA\xF0\xFE\xD6
+>\xA9Kf\x99\xAD\x9Eq\xEEyb\xDF\xDBYtK\xCF\xDB>-,W\xD6\xEF1\xB8\xAF\x89\xB3\xF0AzC\x843\x9D\x9B\x9C.\xBF\x8E]~\xBDg\xAB\xB3ԥvs\xCFl\xFE=\xE5\xB7.\xF9\xB7mi\xDDd\xF68@\xD6*\xE76\xBDS\xB7Kc\xF8\xAC\xBAu\xE5FU[\xE6\xF2\x90\x81Zm5R\xF9
+^?|\xAE\xA1!\xC2έW\xB7\xE9\x8Fa\xA5z\xA7Nk\xA9~Q\xFB˯\xF6\xC7\xDC\xCA\xF4\xA3,p6O\xEB\xA6\xEF\xC7\xC5g3W\xB7\xA2\xAC̬\x9C\xC7Z\xDDK\x98-^\xAE\xFA\xB1\xCE#\x95w\xFD!]\xC0\xB8]\x8Fi(\xEF_[B?-m+\xBF\xBCY\xBB\xBA\xD2~b\x99\xA7\xBAH\xEB;g\xEE\x99f\xED\xE2e[\עV.:VeG\xAF\xDEߪ\xED-\xE79\xBC\xB9:]\x98@\xE9\xB0\x8D\xEE\xBD\xFA,;\xB7\xF75\xCD%E@Į\x80U\xDE'4\x9B\xA1\xBC\xE9q\xFA\x93ʟ-5\xBE\xBA
+\xF3μm\x9E\xD9Vl+v\?]}U\x80\x9D\x96{,\xCA\xF8R\x9D\xA1z\xC3ukhiv\xC7z\xF9\xB9\xC7G\xCA\xEF,UV\xA0\xFFƲ\xC0\xFE[3\xDFuJ\xA8n`k[\xDBddՋ7x\xB5vz\xF5׎\xE5<\xBA\xC1\xF8r\xAE\x85a^\xF6&`\x84	Xa@\x98\x80&`\x84	Xa@X3`]^Y\xB9\xFD\x9EQ\xE1`\x99\x91w\xF2l\xAB\xCF\xDA\xD2\xDFۓ\xAAX\xCAQkl\xA8׼\xFE\xE8\xA8U\xEE\xC4\xDB\xF8\xD4M{\x9F\xF3|\xF9=zR\xAD^\xBC\xB1\xEFж\x97/8\xFF\xBF\x89\xDFZ\xDC_\x87\xB2\xF8\x8A\x95\xB7\xF5\xA4ڦ\x9E}`\xBA\xBAt_\xDAә\xFEA߮C^Q ]\xBD\x83so\xE3\xF3\xECdz\xFD\xB1/\xBC\xAA~\x8F\x9EQ\x9F\xEFLW\x97/8\xFF\xBF\x89uC\x84\x9F\xF5^\x9DVm7\xEC\xFBg.\xAB\xB35sv\x8F,\xAEe|uk+\xF6\xD8Ÿ\xFB\xE5l\xA8\xD7\xECͣVq\xB8o\xD8Ɩ\xD4w\xE7\xD86\xDCp\xC2Y\xA5\xFFr\xD8\xE7y\xF3#\xF3L\xE7\xFF7\xB9\x88\xB8 \xAC9DX*;\x8Do!q6\x868MS9\xBD\xFAQu\xF1\xDB\xB3\x9E\xEA\xD6R\xB3F\xFE]r\x9B\xA7,\xA4S\x93\xD9"\xF7vhm\xEC,;/f\xF9Vs\x8DlH\xA7\x97\xAE\xDF\xDA\xD5\xC1߲\xB4ŵ\xDC\xFE\xAFg\xB5J\x8F-\xBC\xB8Tk\xAB-02guCF\xC5j\xC5\xCBY|\xB1y+9\xB8\xAEůg9\xB1\xFC\x9A\xCC\xDF_\xF9\x91㧳\x8D\x83\xC7ɶ
+<\xF5\x9B\xA2_\xC3\xD6uj\xDE?\xB9\xF5\xCFZ;\xBFwO\xFD\xA5N\xBC\xE3[:R󲆋\x97\xCE*\xC6'\xAE=\xA8\xBE\xEA\xFC?\xB8\x8B_`9`͎\xDA\xC7鏇\xFB\xE5a\xAB:\
+I\xB3?.\xBF6\xDFl\x86٩\xFC\xFEw\xB9x\xB5ڏ	\xA9\xB5TY\xCFٔ\xEA\xB5\xB6b\xB1y;\xB6J(\xEB3\xFB\xB4\xBA\xB3\x86],mq-\x8B[ZnHu\xF7uvJ\xB5\x90V\xE3\xCFZ`d\xCE\xEAf.\x8A\xAD\x8AU\x8Do#Kuf\xE8l\xEC\xCE\xA6U\xE1\xC77\xFB\x9A\xEC\xAC|\x8D\xB7OgG\xF2\xF8\x974\xB5\xE1e5F\x8E\xA5~F\x8E\xFCւ\x8B'\xB7\xCE)z\xB6lg\xED\xE3'\xA5\xE0\xF7(x\xE2\xDC\xD2\xF1/W\xB5b\x8BUZ<\xF4\xF7\xFE\xAA\x83\xEA\xF2e\xE7\xFF\x91]\xFC\xCBC\x84ӏlj\x8F\xB5\x9C~
+\x92\xD5ڗU\xBF\xE1\xF7\xC2[K\xF5\xEB9[|\xD0\xF5G\xA7\xCCrʪ\xBAu\xF4\xAF=嗡\x9C\xA1Uf\xA7\xB5\xABG\xDE\xE0\xF4YMZM7[\xB0\xBA!#\xD6i\xE5z\xFBsV\x97*'\x96\xE5,\xD8\xD9<\x8B\x8B\xF7\x9Bw\xFC\xFB\xB2\xFF\x80)Yܛ\xFB+\xBFj\x8D\xD5m<N\xB2^\x96\xB3x\x86\xA9\x96\xDF9\xF2G6\xAD\xBA\xEA\xF1\xAFö\xEF\xDD\xE3Z\xAA7\xEF\xE5\xF8\x89w\xB1\xC2k\x9B\xAE:C\xFF[P~ڿ\x8Am;\xA8\xCAZ\x9D\xFE\xFC?R\xC8k\xAC"|A\xEE\xBB7\xDF東a\xF1j\x8A\x9A\x9DΨ:G\xFB\xBC`w\xA7\x8E\xCCH\xB1Y\xD3\xCF?\xAF\xBF\xFE\xD3\xF0#*W=\x96\xFC\x9A\xBCr\xD5';mF\xB6\xA2_H+\xD8]\xDA==\xD9\xEA\xED\xF4uxs+ֳ]\xF7\xF5\xDD\xED\|f\xDAڝ8\xFBb\xA4\xEA\xC3Sm\xDE\xDD#>\xAB\xD8\xD7\xF8\xE8\xCA\xF7=\xF5Xzsn\xFB9N\xBC\xAD\xA6\xFB\xE6\x83\xEA\xA3m\xFCa\xAB+;b\xFC_\xB4\xD7\xE2\xE6\xB8\xF1\xC5\xCB\xD9\xB7hsŮ?7Cln\x93Ŷ\x9D\xCD0X\xB1\xC1\xD5]j\xFF\x84Z\\xCBb\xAAR[\xFE\xFD\xD4#\xAD\\xE9\xF8\xA7*\xD69\xAE\xFA\x8Bo\xAB\xE1]\xE4\x80ټ#6W~q\x8D\x9B\xD7UVUc\xDB\xC6V\xCB\xDFs\xE4wNn\x83\x82\x87w\xFF\xD3\xD4|Éw\xF3\x95b\x83\xB5\x8D\xD3:+\xAE-yѹ\xCF\xFF/\xBB\x884+\xD0^}\xFC\xDF~g\xE6l\x91VS^=\x9F\x9D\xBF\xAB\x9F^~m\xB8\xC7)\xAD\xC5WU\xBB5\xA5:\x9C\xB1X\xF3r\x8D\xFD6YU\xC9rh\xA6Sr\xB5\xF2\xFD\xD2fӫ{\xA1ܴjM\xCA\xE9\xE5\xEEk5W\xA75\xAA\xABX\xDCM\x8B\x95\xDC\xD2V\xC5Z\xEB-7\xB3\xB5]\x9D\x95\x963/~_.\xFB\x98\xD6a\xF9X\xC2H\xABV\xBE\x9Cs\xF1\xF8\xA9N?N\xB6mx\xFF,4\xDE\xB3\xA3\xB3\xF9\xAB\xB0r\xD5#\xA7\xE8\xCEV\x8F\xEF\xD3\xD6\xC4\xCDߣ\xD2\xE6\xEF\xE5\xD7W-\xAD_\xF3\xF1\xBD<^f9\xB5\x92\xFDյ
+\xA96Q\xB9\xDEӜ\xFFG
+y
+]\x8EI\xD5\xCB\xCC\xFD\xA0\xD1\xD4\xC0\x8C3\xC3~N\xBC\xBC'}_r\x80s\xE2\xE5X\x8E\xBF\xB0\xFEx\xC0\xDD\xE2 \x83\x9CxyC@\x98!B\x800 L\xC0\xB0\xC2,\x80\xB03\xAC\xFBt\xCB?"\x85ߵ\xA6\xBC\x83\xB7\xAA̸W\xFB
+w\\xD63\xBEl\xF0F/{ަzE	>{\xA2|p\xF5e#l\xF3\xCAf|\xDCk\xA7܃\xD2\xC0\xFBX׃\xF5\x86'\xEE\xC7\xDC\xF3\x9A5\xBE\xF9\xB5\xF9
+\xF7\xAF\xF1\xFA\xEF-g"|\x81\xEA\x9B2\xAA\x86\xCB\xD7VW\xDFk={gu\xE7\xE5\xF0Ւ;SZ\xEF\x87\xEF\xFF}\xF6\xA6\xCF֋\xB5\xEF\xC6\xFF\xC5\xDF\xEA\xBE\xEAT\xB2Z\xE1\xC5\x9E\xAFm\xE1\xC7u\xF5\xDF!_^\x96_N쯽S~\xFF`\x98
+\xDBU׻\xED\xAB\xBE\xF8\xFDq\xBF\x97\xFBh\xB0\xE6\xD9h-5R\xCE!\xEF\x87`Do\xB4\xAB|!\xF9,^Tg\xB8}\xD4\x93y\xBF\xE4\xC7kɥve\xAD\xCE).B\xAD\xCAl\xBEg|sF\xD622\xF3\x86\xDE\xD3\xE6\x8B\xD5\xEE\xAC}q\xB6Jl\xBAU\xC7تM<\xF6\x9E\xD1\xAD
+L}.dh\x88p\xB1\xEFa\xF6o\xEBr\xFA\xAA\x92\xA9^Q\xFA%\xCF:u\x9E}\x99\xACU\xAA\xE4\xFD5kқ\xD9zˉ\x8F\xCBV\xB7\xB7\xD5\xFBҩj\xEB\xA3jdY\xD5ee\xFAf\x9B\xDCYE\xB6\xAAun\xADn\xC3w\x80\xA3\xF4\x86\xCB!\x89\x94\xE7\x95\xFCA\xA6\x9F_#\x96\xFF}\xDE\xEA.\xBF\xB6y碾A\xD9wx\xA0U\x95I\xB5\xF9\x86\xF0]8\xA5\x85{\xB0\x9E7\xDCp\xE0@F\xE8Ğ\xDA\xE6o5&uHe6\xAFԠ\xC0\xF9\xF4\x86[\xFF
+/\xFF\x99>\xBB6\xB4\xA6/\x96\xDC\xFF\xB4\xB3\xC6Un\xCB\xDEl+aU\xAD\xAE\xC5\xED\xD5ee\xAA\x8B\xEF\xD9\xDEruڼ\xB4j\xB5\xBF\xFB\xEA1\xFE\xEE\xDC\xE3k\xB7z|H\xB1S\xABU-p\xECw\x80'Y\xB8\xC9\xFD\xF6\xC7\xEC\xE6\x922K\x95w\x87\xF4G=Z7\xED>Nlu2\xCDJ\xAA^\xB3g\xABi\x8Aj\x95\xCAZ\xCD&v
+\xEF\xACj\xC9\xD5
+\xE9\xEF\x91r\xC1
+gn	\x97F?c\x8Fwz";\x95y\x9Cغk\xEAe-\xD0ZW\xEA\xBB\xF0\xD4Ag:\xF2'\xDF7?\xA1\x97\xD5{\xF3
+\xBFͥX\xE4A\xA3a\xE1\x8B\xC4\xCD\xE3\x8B\xE3}\xB4|\xC4\xFE}*-\xC0\x83a\x86\xC2,\x800 L\xC0\xB0–\xD6\xF5\xC7%\xF1\x94\xC7B\xB6\xBD$\xE4^$б\xF0\xB2\xE7ً\\xF6\xAFO\xBANo\xE1eϳw\xEF_߽\x90~i\xADO=\xB5x\xEB\xEE\xC1\x92o\xF5\x86\xA7i\xBA
+\xC9UsU\xF9ΐ[\x8F\xD7l\x91N	\xFD\xD2F\xF7\xDE\xE0
+-܃u.eʙݛu\xCFU\xB3Q\xC5\xFB\xFFΦϔ\xA5\x8D,\xDEZ
+\xE0XCC\x84\xD34\xDD#T\xF5\xD3\xD9oCOg\xF1K\xD1\xDDUNo-\xFE\xF8G\x807\xB1Ѓ\xF5\xE8\x96r\x9E\xD4Qt\xEF$[\x95\x96\xF4Zoh\xE1W\x84\xAF\xA9\xC4-\xB7IK\xC09,>f\xACV\xF7Ug\xE8\xF0\xF1\xA9W#\xF9\xA9\xF3\xF8\xAB\xFE\xE2F	\x80\xF7\xB1|\xEFy\xFF\xF7}\x97_o\x84o\xCD\xD6yZ\xE9l\x8F\xF3W\xA88\xB2R\x80\xF9\xF1@\x98\x97=\x84	Xa@\x98\x80\xD6|\xD0\xE8\xBF|\xD0\xF5{\xE3ǂz\xB0\xC2,\x80\xB0\xE5w\xB6\xFA\xBENc\xD5[a\xFEY\x9Aa\xC5˞N쯿\x87:\x95\xFE\xFCc9\x8A"\xB0\xC2,\x80\x8A?\xFF\xB8\x8E\x8CV	Xa\xC0ܽ\xEFj['\x96\x80&`\xFCb\xD6k\xB5\xA1K\xC0\xB0\xFES\xED\xAFZۉ%`\x84	Xa\xDEE\xF0\x9F\xC17\xF6\xE9\xC1\xB0\xC22C\x84\xD7\xEB\xFFn\xAD\x9F\xA6u\xBDj\xF7\xB7-\x90\xB2\xF9̓\xA5]k\x8F\xF6/~\xBD^e,\xE0\xD3mX;\xA3U\xA7\xEB\xAA\x8D\xAF\xD9\xF8r\xFD=\xFD\xF9ǵs\x93\xFB\xEDӑ\x8E\xAEuk\xAE\xE2X\x9D=x\xFBH\xCC\x80\xFDV\xDC\xE4\xEE\xFC\xE9F\xF2\xF1\xF5z\xA3\xE0f\xF3]Y+z\xB0\xEE\xD1j\x9A&\xD7\xE0\xCFR\xEE\xAFYP\x9E\xCD`\xA0\x80/w\x8FV\xFDAÖ\x8D\x8Fip\xF5\xFD \x8B\xE9\xAA:E\x86\xE0\x9B\xFD\xF5\xF7t\xCBU۞;z\xD8s\xB0ZMt{\xB6񖗱`\x9B#4:ҏ\xC2N\xABB\x92\xF6\x80\x88\x83\xDFE\xE8\x8A\xFET#\x83\x83\x8B%\xD8G\xB0\x96W\xE5\x9Cֶ>\x85\xB0\x9F\x80\xF5E\xF4E\xC0\xA0?\xFF\xB8\xDE~H\xB8\xEDI
+\xF2$\xD9n'\x85|\x9Bm?\xBCӃŜ,;	X\xDFbglr'\x8Ck\xFD\xFC\xFBsA\xFD\xBD1\x83\xBF\xAD\xFD\xBB\xC6\xCE\xE0۬\xEAJ\xF8\xE7\xE7\x8FVLr\xC0\xE52|\xDF\xD5\xC8m\xEF\x86e\x94	Xg#\xC0\xE1\xDEe\x88\xF06\xDC\xE83\xB2\xEC\xFEg\x9A\x8FW\xE3\xD9+z\x81i\x9A5\xD8\xEC\xE0\x80\xB5\xE7*>\xB8lk\xB6\xDB\xF4\xFD\xE9g\xB1{\xB2#\xF0\x89XF\xAB\xD9<{rϪ\xAD8\xF0q\x9D\xB2\xBCҫ\xD6r\xD5ڙ\xB7\xE5\x9E\xC51\xC7jR\xDDf㵊\x97/\xAB\xC0\xA2\x97\xDE\xE4\xBE'^\xACZ\xF69\xE3\xF1\xA7i*+V\x9DX]8\x99\x97\xF6`\xDDdž{\xA8Ǘ}\xFCt\xA4W鲲c\xA6LW\x9D\x99\xDD-_\xE8\xB0\xC74\xECi\xF9\xB5`\xABWi\xF3J\xD7֤?\x8F\xD4'v\xAA\xE7`\x8D\xFC^/\xF8J>w#U\xA7
+X\x97\xEE\x9DO}\x83?9\xDCP\xF2E'|\x99\xB3\xAC\x91\x9E'\xDDW@˩\xD6SC\xCF3:\x9Ctb\xC0)\x9D*`\xBC\x83wy\xE1\xC7\xD1\xF9\xB4\xE8\xC1\xB0\x86\xE8\xAF\xC6"\xDCȯ\x80=Xa@\x98\x80u*\xCF\xB840
+#,\x800k\xA3s\xFF\xAE\xF0\xDC[\xCF&`}\x81	^I\xC0\xB0\xB6\xDB\xDF-􌎥\xE7݇\xEEw$`ư\x9C\x95\x805\xA4\xD5y#$%k\xAFm\xEB\xB6ԓݪŎ׳:\xA7\xF1A'`\xE8\xC7	X\xA3\xFA]8\xAB2\xD6Y\xB6\xC3I\xF7\xAC"`\xC5Ʀ\xFBlR\x9C\x95\x80\xB5\xC2b$\xBA^\xAF\xAD\x98u\xFD\xF1\x84zՕ\xB5Y{9\x8F k\xFDvtNh$Ǽ&\xB5LӴ3\xD2IW\xB0\x81\xACu"\x81\xE3\xC0\xD4\xD2\xCF[\xEE\xD6\x80k\xB5\xCF\xEA\xD4(48)\xD6\xF8E\xFA%\xEC\\xFB\xFE\xCA\xEFI\xAFO-\x8B\xABzs\x98t\x9Bm	X\xFB\x87\x99\xF6\x94\xB0s\xED\xA91\xB2
+\xF9c\x9A\xA6\xA3RK5c\xB5\xEE\xBB?\xB0\x9Ep+nr\xDF\xD0;5\xBBN\xEF)a\xE7\xDA\xF7W\xBEt\x9Ba\xB0\xE4\xC3#\xCB`m\xAF'\x9C\xC0\x8A\x80\xB5\xFF\xD2{\xE0\xC8\xDA\xF3rC?\xBE[^iŬw\xAB'|4\x8Fi\x88\xF9\xA0\x8C\xF2AU\x80O\xE4W\x84a@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80\xF6[\xA4\x94\xEB\xF5z\xFBc\x9A\xA6mn[\xE0
+\xED
+X\xB3x\xB4\xF1\xEB\xF5*c\x9Fnc\xC0\xDA\xAD:%\xC8X\xAF\xB7\xB9\xA8Z\xB0\xF6\xE7*ފ
+ϰ\xE2&\xF7\xDB\xC5X'\xC79\\xAFW\xE9
+\x9EdE\xD6=ZM\xD3\xE4\xDA\xFC\xB9\xEC;x\xB6\x8D\xF7`\xC9X\xC7\xFE\x80\x979\xEC9X\xAD\xA1FC\x90qF\xE0\xC52\xCF\xC1ڦ\xEC\x93\xAE\xE2\xAAw\xCE\xC9[\xF0TG\xAC\x8BD\xF5|Z^ϫr\xBE\x91\xD4O%`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80v\xF0\x93\xDC\xEF\xEE/o\xD9\xF0̑e˗\xC3\xC4\xB6\xD9z\xFF\x8C\xA7z\xC0\xB798`\xEDy)\xDEಭ٪/\xE9{F5\xF6dG\xE0\xB0\x8CV\xB3y\xF6\xE4\x9EU[\xB1s]\xC0\xA7xu\xC0zA\xAEZ;\xF3\xB6ܳ8\xE6X\xAD@\xAA\xDBxg/\xBD\xC9}O\xBCX\xB5\xEC\x9E\xB7\xA1\xFCi\x9AʊU'VN\xE6\xA5=X\xF7\xC01M\xD3ڐ1\xBE\xEC\xE3\xA7#\xBDJ\x97\x95\x9DXe\xBA\xEA̼aK\x80Ow\xD8c\xF6\x93\x8D\xFCZ\xB0ի\xB4y\xA5kkҟG\xEA\x80;\xD5s\xB0F~\xAF\xB73cu\xBA\xC7nN\xB0.\xDD;\x9F\xFAr\xB8\xA1\xE4\x8BN,\xF82gX#"=O\xBA\xAF\x80\x96S\xAC\xA7\x86\x9Egt8\xE9\xC4\x80S:U\xC0x\xEF\xF2.\xA3\xF3	hу&`
+\xD1_\x8C3D\xB8\x91_-z\xB0\xC2,\x800 L\xC0\xB06\xF2\xBBB\xA0E\xC0\xB0\xC2\xAC\xED\xF6\x8Fg\x80S\xB0#]\xC0Y	XCZ\xCFm\x92\x80\x92\x80\xB5׶\x8Cu[\xCA\xFBv\xE0\x94\xAC\xFDX\xC0#kT\xBF\xB7iU\xC6\xC8\xE0\xDC\xAC\x98\xC1\xD8t\x9F\xCD\xF8 \x9C\xD5oGW\xE0\x93L\xD3\xD4OQ\x9D;\xAB\xF4Z\xC0\xF7\xB0\xF2F\xB2\x94\xEE+81C\x84\xEBD\x82\x91t\xE7&`\xAD&}Vkl\xFCN\xA3=%\xEC\\xFB\xFE\xCA\xEF\xC9X\xEF\x90\xCF\xF6\xB7б%`\x8D\xDC\xE8\xFD\xBCv\xAE}\xE5o6\xE4\xA4i\x9A\xDE9]\x8D|
+\x8CXq\x93\xFB\x86ީY\x9E\xD8S\xC2ε\xEF\xAF|\xE96\xC3`\xC9F\xAB\xB5\x99i6\xFF;\x84B\xF8,+\xD6\xFE\xED\x81#k\xCFK	\xFD\xF8\xE9\xE4\xEA_\xC5cb\xE4\xE0Ư\xC2,\x800 L\xC0\xB0\xC2,\x800 L\xC0\xB0\xC2,\x800 ̻*\xFE\xFC\xE3z\xFB㯿W\xBFnX@\x98\x80&`\x84]\xA7\xA9>\xAC\xF8\xEF\xF5㎿7f8\x8D\xEBO\xF2\xF1\xCF\xCF\xAD\x98\xA4 ̯.\x97\xE1_\xDE]ء L\xC03D\xF0\x9F\xD6\xE0\xAAǍ\xEA\xC1\xB0\xFES\xED\xA9Z\xFB\xB6 L\xC0\xF8Ŭ\xBF\xCA˞\x8E'`\xCC\xDD{\xAD6t_],\x808\xCF\xC1\xA8\xD8\xD6wu\xA3 L\xC0\xB0\xC2܃p\xB9\xB4\xDFB\xB8\xC1r\xC0\xFA\xF7[\xC0{\xFA'Z\x9A!B\x800 \xEC:M۟\xF1@I@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\x98\x80&`\x84	Xa@\xD8\xFF\xE1В\xF4\xF1.^\xAEIEND\xAEB`\x82
\ No newline at end of file

Copied: branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon-expected.txt (from rev 140525, trunk/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon-expected.txt) (0 => 140771)


--- branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon-expected.txt	                        (rev 0)
+++ branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon-expected.txt	2013-01-25 04:10:16 UTC (rev 140771)
@@ -0,0 +1,13 @@
+You should run this test in DRT. 
+For manual testing, hold middle button in scrollable and move aroudn mouse pointer for scrolling, then release middle button to stop scrolling. You won't see pan icon after pan scroll.
+Scrollable
+line 0
+line 1
+line 2
+line 3
+line 4
+line 5
+line 6
+line 7
+line 8
+line 9

Copied: branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon.html (from rev 140525, trunk/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon.html) (0 => 140771)


--- branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon.html	                        (rev 0)
+++ branches/chromium/1364/LayoutTests/platform/chromium-win/fast/events/panScroll-panIcon.html	2013-01-25 04:10:16 UTC (rev 140771)
@@ -0,0 +1,67 @@
+<html>
+<head>
+<style type="text/css">
+#draggable {
+  padding: 5pt;
+  border: 3px solid #00cc00;
+  background: #00cccc;
+  width: 80px;
+  cursor: hand;
+}
+
+#scrollable {
+    height: 200px;
+    overflow: auto;
+    border: solid 3px #cc0000;
+    font-size: 80px;
+}
+</style>
+<script>
+function $(id) { return document.getElementById(id); }
+var MIDDLE_BUTTON = 1;
+var PAN_SCROLL_RADIUS = 15; // from WebCore/platform/ScrollView.h
+
+function setUpTest()
+{
+    var scrollable = $('scrollable');
+    for (var i = 0; i < 10; ++i) {
+      var line = document.createElement('div');
+      line.innerHTML = "line " + i;
+      scrollable.appendChild(line);
+    }
+
+    var scrollable = $('scrollable');
+
+   if (window.testRunner)
+        testRunner.dumpAsText(true);
+
+    if (!window.eventSender)
+        return;
+
+    // Start pan scroll by click
+    eventSender.mouseMoveTo(scrollable.offsetLeft + 5, scrollable.offsetTop + 5);
+    eventSender.mouseDown(MIDDLE_BUTTON);
+    eventSender.mouseUp(MIDDLE_BUTTON);
+    eventSender.mouseMoveTo(scrollable.offsetLeft + 5, scrollable.offsetTop + PAN_SCROLL_RADIUS + 6);
+
+    // Stop pan scroll by click
+    eventSender.mouseDown(MIDDLE_BUTTON);
+    eventSender.mouseUp(MIDDLE_BUTTON);
+}
+</script>
+</head>
+<body>
+You should run this test in DRT.
+<br>
+For manual testing, hold middle button in scrollable and move aroudn mouse pointer for scrolling, then release middle button to stop scrolling.
+You won't see pan icon after pan scroll.
+<div id="container">
+Scrollable
+<div id="scrollable">
+</div>
+</div>
+<script>
+setUpTest();
+</script>
+</body>
+</html>

Modified: branches/chromium/1364/Source/WebCore/page/AutoscrollController.cpp (140770 => 140771)


--- branches/chromium/1364/Source/WebCore/page/AutoscrollController.cpp	2013-01-25 04:06:12 UTC (rev 140770)
+++ branches/chromium/1364/Source/WebCore/page/AutoscrollController.cpp	2013-01-25 04:10:16 UTC (rev 140771)
@@ -83,7 +83,6 @@
 {
     RenderBox* scrollable = m_autoscrollRenderer;
     m_autoscrollTimer.stop();
-    m_autoscrollType = NoAutoscroll;
     m_autoscrollRenderer = 0;
 
     if (!scrollable)
@@ -108,6 +107,8 @@
     }
 #endif
 
+    m_autoscrollType = NoAutoscroll;
+
 #if ENABLE(PAN_SCROLLING)
     // If we're not in the top frame we notify it that we are not doing a panScroll any more.
     if (Frame* mainFrame = getMainFrame(frame)) {

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to