diff options
| author | samuong@chromium.org <samuong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-02 11:27:13 +0000 |
|---|---|---|
| committer | samuong@chromium.org <samuong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-02 11:27:13 +0000 |
| commit | 348cf5e61ffda7c9776b4f10b2c3bcf912508611 (patch) | |
| tree | 3f4b2ed0333caa8bb62d6d9da37e3db822b29869 /third_party/webdriver | |
| parent | d447b9cf08e87a64d1a8abc866745cd16d95e6c5 (diff) | |
| download | chromium_src-348cf5e61ffda7c9776b4f10b2c3bcf912508611.zip chromium_src-348cf5e61ffda7c9776b4f10b2c3bcf912508611.tar.gz chromium_src-348cf5e61ffda7c9776b4f10b2c3bcf912508611.tar.bz2 | |
[chromedriver] Fix mouse button value map in WebDriver atoms.
BUG=chromedriver:868
Review URL: https://codereview.chromium.org/420663006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/webdriver')
| -rw-r--r-- | third_party/webdriver/atoms.cc | 4 | ||||
| -rw-r--r-- | third_party/webdriver/patch.diff | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/third_party/webdriver/atoms.cc b/third_party/webdriver/atoms.cc index 819ab74..6675b00 100644 --- a/third_party/webdriver/atoms.cc +++ b/third_party/webdriver/atoms.cc @@ -834,8 +834,8 @@ const char* const CLICK[] = { "null}this.m=new u(a.clientXY.x,a.clientXY.y);this.o=!!a.nextClickIsDoub", "leClick;this.w=!!a.hasEverInteracted;try{a.element&&J(a.element)&&jb(th", "is,a.element)}catch(e){this.g=null}}}ba(Gb,ib);var W={};W[Q]=[0,1,2,nul", - "l];W[vb]=[null,null,2,null];W[qb]=[0,1,2,null];W[nb]=[0,1,2,0];\nW[xb]=", - "[0,1,2,0];W[wb]=W[Q];W[ob]=W[qb];W[mb]=W[nb];Gb.prototype.move=function", + "l];W[vb]=[null,null,2,null];W[qb]=[0,1,2,null];W[nb]=[0,1,2,4];\nW[xb]=", + "[0,1,2,4];W[wb]=W[Q];W[ob]=W[qb];W[mb]=W[nb];Gb.prototype.move=function", "(a,c){var b=Ya(a),d=N(a);this.m.x=c.x+d.left;this.m.y=c.y+d.top;d=this.", "i();if(a!=d){try{Ca(w(d)).closed&&(d=null)}catch(e){d=null}if(d){var g=", "d===ca.document.documentElement||d===ca.document.body,d=!this.w&&g?null", diff --git a/third_party/webdriver/patch.diff b/third_party/webdriver/patch.diff index 92b5f96..e24ff8a7 100644 --- a/third_party/webdriver/patch.diff +++ b/third_party/webdriver/patch.diff @@ -1,3 +1,27 @@ +diff --git a/javascript/atoms/mouse.js b/javascript/atoms/mouse.js +index bed494b..d6c3be1 100644 +--- a/javascript/atoms/mouse.js ++++ b/javascript/atoms/mouse.js +@@ -141,7 +141,7 @@ bot.Mouse.NO_BUTTON_VALUE_INDEX_ = 3; + * click/ mouseup/ mouseout/ mousemove contextmenu + * dblclick mousedown mouseover + * IE_DOC_PRE9 0 0 0 X 1 4 2 X 0 0 0 0 1 4 2 0 X X 0 X +- * WEBKIT/IE9 0 1 2 X 0 1 2 X 0 1 2 0 0 1 2 0 X X 2 X ++ * WEBKIT/IE9 0 1 2 X 0 1 2 X 0 1 2 4 0 1 2 4 X X 2 X + * GECKO/OPERA 0 1 2 X 0 1 2 X 0 0 0 0 0 0 0 0 X X 2 X + * </pre> + * @private {!Object.<bot.events.EventType, !Array.<?number>>} +@@ -161,8 +161,8 @@ bot.Mouse.MOUSE_BUTTON_VALUE_MAP_ = (function() { + buttonValueMap[bot.events.EventType.CLICK] = [0, 1, 2, null]; + buttonValueMap[bot.events.EventType.CONTEXTMENU] = [null, null, 2, null]; + buttonValueMap[bot.events.EventType.MOUSEUP] = [0, 1, 2, null]; +- buttonValueMap[bot.events.EventType.MOUSEOUT] = [0, 1, 2, 0]; +- buttonValueMap[bot.events.EventType.MOUSEMOVE] = [0, 1, 2, 0]; ++ buttonValueMap[bot.events.EventType.MOUSEOUT] = [0, 1, 2, 4]; ++ buttonValueMap[bot.events.EventType.MOUSEMOVE] = [0, 1, 2, 4]; + } else { + buttonValueMap[bot.events.EventType.CLICK] = [0, 1, 2, null]; + buttonValueMap[bot.events.EventType.CONTEXTMENU] = [null, null, 2, null]; diff --git a/javascript/chrome-driver/build.desc b/javascript/chrome-driver/build.desc index 356eefd..b0e6cae 100644 --- a/javascript/chrome-driver/build.desc |