diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/third_party/webdriver/patch.diff | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/webdriver/patch.diff')
| -rw-r--r-- | chromium/third_party/webdriver/patch.diff | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/chromium/third_party/webdriver/patch.diff b/chromium/third_party/webdriver/patch.diff index 8acc9317678..e13623cd90f 100644 --- a/chromium/third_party/webdriver/patch.diff +++ b/chromium/third_party/webdriver/patch.diff @@ -1,8 +1,20 @@ -Index: javascript/chrome-driver/build.desc -=================================================================== ---- javascript/chrome-driver/build.desc (revision 18456) -+++ javascript/chrome-driver/build.desc (working copy) -@@ -24,6 +24,11 @@ +diff --git a/javascript/atoms/device.js b/javascript/atoms/device.js +index e2693f8..3731db3 100644 +--- a/javascript/atoms/device.js ++++ b/javascript/atoms/device.js +@@ -627,6 +627,7 @@ bot.Device.prototype.maybeToggleOption = function() { + // Only WebKit fires the change event itself and only for multi-selects, + // except for Android versions >= 4.0. + if (!(goog.userAgent.WEBKIT && select.multiple) || ++ (goog.userAgent.product.CHROME && bot.userAgent.isProductVersion(28)) || + (goog.userAgent.product.ANDROID && bot.userAgent.isProductVersion(4))) { + bot.events.fire(select, bot.events.EventType.CHANGE); + } +diff --git a/javascript/chrome-driver/build.desc b/javascript/chrome-driver/build.desc +index 423c450..1889095 100644 +--- a/javascript/chrome-driver/build.desc ++++ b/javascript/chrome-driver/build.desc +@@ -24,6 +24,11 @@ js_fragment(name = "get_page_zoom", function = "webdriver.chrome.getPageZoom", deps = [ ":deps" ]) @@ -14,7 +26,7 @@ Index: javascript/chrome-driver/build.desc js_test(name = "test", srcs = [ "test/*_test.html" ], deps = [ -@@ -39,6 +44,7 @@ +@@ -39,6 +44,7 @@ js_fragment_cpp(name = "atoms", "//javascript/chrome-driver:get_location_in_view:chrome", "//javascript/chrome-driver:get_page_zoom:chrome", "//javascript/chrome-driver:is_element_clickable:chrome", |