107705 2013-01-23 10:44:44 -0800 [Qt] window.open passes height and width parameters even if not defined in a page 2013-08-09 11:44:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 88186 0 jingdow allan.jensen allan.jensen gyuyoung.kim jturcotte kenneth nowrep rakuco webkit.review.bot oldest_to_newest 814351 0 jingdow 2013-01-23 10:44:44 -0800 In latest qtwebkit, unlike in previous stable versions, there's issue with top links in Gmail, when using QupZilla web browser (which supports javascript popup windows). Those links are not opening in new tab, as they do with qtwebkit 2.2, but rather they open in a popup window with 100x100 px in dimension. Web browsers (behaviour tested in Opera, for example) process window.popup request like this: - if the height and width parameters are defined a popup window with the defined dimensions is opened - if heoight/width aren't defined then a window is opened in a new tab This is the exact same behaviour of qtwebkit 2.2, but with the version 2.3 it seems that if no width/height in window.open request is defined a default minimum of 100px is passed to a browser. (QupZilla web browser workarounded this for qtwebkit-2.3 by checking if the popup window has width and height of 100px: https://github.com/QupZilla/qupzilla/commit/2135ab8d13d221fb45d53419fcc9019ddaf4a070) 814359 1 nowrep 2013-01-23 10:51:32 -0800 The change is in QWebPage::geometryChangeRequested(QRect) signal. Until QtWebKit 2.3, it fired with * invalid QRect if it was opening links with target="_blank" and * valid QRect if it was opening real popup window (window.open) However, it has now changed to return QRect.size() == QSize(100, 100) if it is opening target="_blank" links. So it makes impossible to distinguish window.open (with size 100x100) and target="_blank" links. 815290 2 allan.jensen 2013-01-24 03:12:37 -0800 (In reply to comment #1) > The change is in QWebPage::geometryChangeRequested(QRect) signal. > Until QtWebKit 2.3, it fired with > * invalid QRect if it was opening links with target="_blank" and > * valid QRect if it was opening real popup window (window.open) > > However, it has now changed to return QRect.size() == QSize(100, 100) if it is opening target="_blank" links. > So it makes impossible to distinguish window.open (with size 100x100) and target="_blank" links. Is that the same trick used by all the Qt browsers, to detect this? 815292 3 nowrep 2013-01-24 03:17:17 -0800 I know only about kWebKitPart and QupZilla that are trying to detect whether to open popup window. And yes, kWebKitPart is also using the exact same trick. 815314 4 allan.jensen 2013-01-24 04:06:16 -0800 The issue appears to be with enforcing the minimumWindowSize from ChromeClient.h 815323 5 allan.jensen 2013-01-24 04:27:32 -0800 Seems to be regresssion caused the patch for bug #102072 815334 6 184465 allan.jensen 2013-01-24 04:43:22 -0800 Created attachment 184465 Patch Quick patch, needs test. 815339 7 jingdow 2013-01-24 04:49:31 -0800 (In reply to comment #6) > Created an attachment (id=184465) [details] > Patch > > Quick patch, needs test. It works! Thank you very much. 815341 8 jingdow 2013-01-24 04:55:18 -0800 (In reply to comment #7) > (In reply to comment #6) > > Created an attachment (id=184465) [details] [details] > > Patch > > > > Quick patch, needs test. > > It works! Thank you very much. Some more information: window.open opens window in new tab if no width or height are defined and if only one of those is defined. If both window and height are defined window.open opens a popup window with given dimensions. If height/width is defined lower than 100 px opened popup window defaults to 100 px. 815349 9 nowrep 2013-01-24 05:14:55 -0800 Confirm, the patch fixe the issue. @daimonion This has nothing to do with QtWebKit, this decision is made inside client application (kWebKitPart or QupZilla) 815361 10 184469 allan.jensen 2013-01-24 05:29:29 -0800 Created attachment 184469 Patch 815364 11 webkit.review.bot 2013-01-24 05:33:13 -0800 Attachment 184469 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/page/DOMWindow.cpp', u'Source/WebKit/qt/ChangeLog', u'Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp']" exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:448: Place brace on its own line for function definitions. [whitespace/braces] [4] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3281: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3282: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 3 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 815368 12 184469 kenneth 2013-01-24 05:39:21 -0800 Comment on attachment 184469 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184469&action=review > Source/WebCore/page/DOMWindow.cpp:346 > + // Let size 0 pass through, since that indicates default size, not minimum size. > + if (window.width()) > + window.setWidth(min(max(minimumSize.width(), window.width()), screen.width())); > + if (window.height()) > + window.setHeight(min(max(minimumSize.height(), window.height()), screen.height())); Shouldnt this be documented in some API? Can we make a WK2 C api unit test? 815376 13 kenneth 2013-01-24 05:47:04 -0800 LGTM, but please check if there are some places where documentation has to be updated (say EFL, GTK etc) 826460 14 186857 allan.jensen 2013-02-06 08:08:27 -0800 Created attachment 186857 Patch Update EFL and GTK to handle the return to possibly empty rects in setWindowRect. 826461 15 webkit.review.bot 2013-02-06 08:10:43 -0800 Attachment 186857 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/page/DOMWindow.cpp', u'Source/WebKit/efl/ChangeLog', u'Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp', u'Source/WebKit/gtk/ChangeLog', u'Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp', u'Source/WebKit/qt/ChangeLog', u'Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp']" exit_code: 1 Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:448: Place brace on its own line for function definitions. [whitespace/braces] [4] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3280: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp:3281: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 3 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 831921 16 186857 kenneth 2013-02-13 08:19:05 -0800 Comment on attachment 186857 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186857&action=review r=me with comments > Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:131 > - if (!ewk_view_setting_enable_auto_resize_window_get(m_view)) > + if (!ewk_view_setting_enable_auto_resize_window_get(m_view) || rect.isEmpty()) You should add a FIXME: An empty rect means that default size should be used. Handle this case. > Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:146 > - gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height()); > + if (!intrect.isEmpty()) > + gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height()); Same here 831922 17 186857 kenneth 2013-02-13 08:19:20 -0800 Comment on attachment 186857 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186857&action=review r=me with comments > Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:131 > - if (!ewk_view_setting_enable_auto_resize_window_get(m_view)) > + if (!ewk_view_setting_enable_auto_resize_window_get(m_view) || rect.isEmpty()) You should add a FIXME: An empty rect means that default size should be used. Handle this case. > Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:146 > - gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height()); > + if (!intrect.isEmpty()) > + gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height()); Same here 831935 18 allan.jensen 2013-02-13 08:35:01 -0800 (In reply to comment #17) > (From update of attachment 186857 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=186857&action=review > > r=me with comments > > > Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:131 > > - if (!ewk_view_setting_enable_auto_resize_window_get(m_view)) > > + if (!ewk_view_setting_enable_auto_resize_window_get(m_view) || rect.isEmpty()) > > You should add a FIXME: An empty rect means that default size should be used. Handle this case. > > > Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:146 > > - gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height()); > > + if (!intrect.isEmpty()) > > + gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height()); > > Same here I was assuming the default size would be used when the window was opened, which means only the resize is unnecessary. 831937 19 kenneth 2013-02-13 08:41:09 -0800 You are probably right... fine with mee 831957 20 allan.jensen 2013-02-13 09:07:53 -0800 (In reply to comment #19) > You are probably right... fine with mee Thanks! 831963 21 186857 webkit.review.bot 2013-02-13 09:23:21 -0800 Comment on attachment 186857 Patch Clearing flags on attachment: 186857 Committed r142755: <http://trac.webkit.org/changeset/142755> 831964 22 webkit.review.bot 2013-02-13 09:23:26 -0800 All reviewed patches have been landed. Closing bug. 915843 23 ap 2013-08-09 08:29:49 -0700 Please don't use bracketed prefixes on cross-platform patches. This one had cross-platform changes, and actually caused a regression in Safari (<rdar://problem/14693930>). 915850 24 allan.jensen 2013-08-09 08:58:56 -0700 (In reply to comment #23) > Please don't use bracketed prefixes on cross-platform patches. This one had cross-platform changes, and actually caused a regression in Safari (<rdar://problem/14693930>). Sorry, the brackets should not have been there. I was later told the patch solve the same problem on GTK and Chromium. 915892 25 ap 2013-08-09 11:44:32 -0700 Filed bug 119633. 184465 2013-01-24 04:43:22 -0800 2013-01-24 05:29:26 -0800 Patch bug-107705-20130124133936.patch text/plain 2057 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M3ZTU3YzdhNTNhZTNj NTRiN2ZiYzUyMzY1NDZkMTM2ZGRmY2E2NS4uZjcyY2JjZjlhMTJlZmQ0NzBjOWE2NGYxYzFiZTNi YTUzYjcyYTkyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTI0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gd2luZG93Lm9wZW4gcGFzc2VzIGhlaWdodCBhbmQgd2lkdGggcGFyYW1ldGVycyBldmVuIGlm IG5vdCBkZWZpbmVkIGluIGEgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA3NzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRG8gbm90IG92ZXJyaWRlIHdpZHRoIG9yIGhlaWdodCBvZiAwLCBhcyB0 aGF0IGluZGljYXRlcyBkZWZhdWx0IHNpemUsIGFuZCBub3QgbWluaW11bSBzaXplLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9ET01XaW5kb3cuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93OjphZGp1c3RXaW5kb3dSZWN0KToKKwogMjAx My0wMS0yMyAgUmFmYWVsIFdlaW5zdGVpbiAgPHJhZmFlbHdAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJFR1JFU1NJT04ocjE0MDEwMSk6IGNhdXNlZCBkZWJ1ZyBhc3NlcnRzIGluIGZhc3QvZm9y bXMvYXNzb2NpYXRlZC1lbGVtZW50LWNyYXNoLmh0bWwgYW5kIGh0bWw1bGliL3J1bi10ZW1wbGF0 ZS5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKaW5kZXggMmY1MWE4MTc1MGNhNWNkOGY1 YmQ1ZDI0ZGVjZGUwODQ1ZTBhZmM2YS4uNjFmOWE2YmQxNDY1Y2Y2NTBhZWQwYTU2ODFkYmE3M2U4 Yzc0ZGYzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcApAQCAtMzM5LDggKzMzOSwxMSBA QCBGbG9hdFJlY3QgRE9NV2luZG93OjphZGp1c3RXaW5kb3dSZWN0KFBhZ2UqIHBhZ2UsIGNvbnN0 IEZsb2F0UmVjdCYgcGVuZGluZ0NoYW5nZQogICAgICAgICB3aW5kb3cuc2V0SGVpZ2h0KHBlbmRp bmdDaGFuZ2VzLmhlaWdodCgpKTsKIAogICAgIEZsb2F0U2l6ZSBtaW5pbXVtU2l6ZSA9IHBhZ2Ut PmNocm9tZSgpLT5jbGllbnQoKS0+bWluaW11bVdpbmRvd1NpemUoKTsKLSAgICB3aW5kb3cuc2V0 V2lkdGgobWluKG1heChtaW5pbXVtU2l6ZS53aWR0aCgpLCB3aW5kb3cud2lkdGgoKSksIHNjcmVl bi53aWR0aCgpKSk7Ci0gICAgd2luZG93LnNldEhlaWdodChtaW4obWF4KG1pbmltdW1TaXplLmhl aWdodCgpLCB3aW5kb3cuaGVpZ2h0KCkpLCBzY3JlZW4uaGVpZ2h0KCkpKTsKKyAgICAvLyBMZXQg c2l6ZSAwIHBhc3MgdGhyb3VnaCwgc2luY2UgdGhhdCBpbmRpY2F0ZXMgZGVmYXVsdCBzaXplLCBu b3QgbWluaW11bSBzaXplLgorICAgIGlmICh3aW5kb3cud2lkdGgoKSkKKyAgICAgICAgd2luZG93 LnNldFdpZHRoKG1pbihtYXgobWluaW11bVNpemUud2lkdGgoKSwgd2luZG93LndpZHRoKCkpLCBz Y3JlZW4ud2lkdGgoKSkpOworICAgIGlmICh3aW5kb3cuaGVpZ2h0KCkpCisgICAgICAgIHdpbmRv dy5zZXRIZWlnaHQobWluKG1heChtaW5pbXVtU2l6ZS5oZWlnaHQoKSwgd2luZG93LmhlaWdodCgp KSwgc2NyZWVuLmhlaWdodCgpKSk7CiAKICAgICAvLyBDb25zdHJhaW4gdGhlIHdpbmRvdyBwb3Np dGlvbiB3aXRoaW4gdGhlIHZhbGlkIHNjcmVlbiBhcmVhLgogICAgIHdpbmRvdy5zZXRYKG1heChz Y3JlZW4ueCgpLCBtaW4od2luZG93LngoKSwgc2NyZWVuLm1heFgoKSAtIHdpbmRvdy53aWR0aCgp KSkpOwo= 184469 2013-01-24 05:29:29 -0800 2013-02-06 08:08:23 -0800 Patch bug-107705-20130124142543.patch text/plain 5956 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M3ZTU3YzdhNTNhZTNj NTRiN2ZiYzUyMzY1NDZkMTM2ZGRmY2E2NS4uNDBiNTQyNmYyMTBkMzZhNmE2ZTY5ZDk2YWRiZDY3 NDNlMDBjZWE2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAxLTI0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gd2luZG93Lm9wZW4gcGFzc2VzIGhlaWdodCBhbmQgd2lkdGggcGFyYW1ldGVycyBldmVuIGlm IG5vdCBkZWZpbmVkIGluIGEgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA3NzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRG8gbm90IG92ZXJyaWRlIHdpZHRoIG9yIGhlaWdodCBvZiAwLCBhcyB0 aGF0IGluZGljYXRlcyBkZWZhdWx0IHNpemUsIGFuZCBub3QgbWluaW11bSBzaXplLgorCisgICAg ICAgIFRlc3RlZCBieSB0c3RfcXdlYnBhZ2UuCisKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmFkanVzdFdpbmRvd1JlY3QpOgorCiAy MDEzLTAxLTIzICBSYWZhZWwgV2VpbnN0ZWluICA8cmFmYWVsd0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUkVHUkVTU0lPTihyMTQwMTAxKTogY2F1c2VkIGRlYnVnIGFzc2VydHMgaW4gZmFzdC9m b3Jtcy9hc3NvY2lhdGVkLWVsZW1lbnQtY3Jhc2guaHRtbCBhbmQgaHRtbDVsaWIvcnVuLXRlbXBs YXRlLmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggYzNkZThmODNjOTljNjliYzlmYmM0YjRlY2RkZTVj YWM4MDA5ZGM2Yy4uNDNkZTI0NGEyNmVjZDI2ZjE3OWRiYWNhYTI3MTJjMTVhMDllMGQ0NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMy0wMS0yNCAgQWxsYW4gU2FuZGZlbGQg SmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRdIHdpbmRvdy5v cGVuIHBhc3NlcyBoZWlnaHQgYW5kIHdpZHRoIHBhcmFtZXRlcnMgZXZlbiBpZiBub3QgZGVmaW5l ZCBpbiBhIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwNzcwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRlc3QgdGhhdCBtaW5pbXVtIHNpemUgaXMgYXBwbGllZCBvbmx5IHdoZW4gdGhlIHJlcXVl c3RlZCBzaXplIGlzIHRvbyBzbWFsbCwKKyAgICAgICAgbm90IHdoZW4gZGVmYXVsdCBpcyByZXF1 ZXN0ZWQuCisKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAg ICAgICAodHN0X1FXZWJQYWdlKToKKyAgICAgICAgKFRlc3RQYWdlKToKKyAgICAgICAgKFRlc3RQ YWdlOjpUZXN0UGFnZSk6CisgICAgICAgIChUZXN0UGFnZTo6Y3JlYXRlV2luZG93KToKKyAgICAg ICAgKFRlc3RQYWdlOjpzbG90R2VvbWV0cnlDaGFuZ2VSZXF1ZXN0ZWQpOgorICAgICAgICAodHN0 X1FXZWJQYWdlOjpvcGVuV2luZG93RGVmYXVsdFNpemUpOgorCiAyMDEzLTAxLTIyICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIGEgcGxhdGZvcm9t IHN0cmF0ZWd5IGZvciBsb2NhbCBzdG9yYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0RPTVdpbmRvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKaW5k ZXggMmY1MWE4MTc1MGNhNWNkOGY1YmQ1ZDI0ZGVjZGUwODQ1ZTBhZmM2YS4uNjFmOWE2YmQxNDY1 Y2Y2NTBhZWQwYTU2ODFkYmE3M2U4Yzc0ZGYzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGFnZS9ET01XaW5kb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNw cApAQCAtMzM5LDggKzMzOSwxMSBAQCBGbG9hdFJlY3QgRE9NV2luZG93OjphZGp1c3RXaW5kb3dS ZWN0KFBhZ2UqIHBhZ2UsIGNvbnN0IEZsb2F0UmVjdCYgcGVuZGluZ0NoYW5nZQogICAgICAgICB3 aW5kb3cuc2V0SGVpZ2h0KHBlbmRpbmdDaGFuZ2VzLmhlaWdodCgpKTsKIAogICAgIEZsb2F0U2l6 ZSBtaW5pbXVtU2l6ZSA9IHBhZ2UtPmNocm9tZSgpLT5jbGllbnQoKS0+bWluaW11bVdpbmRvd1Np emUoKTsKLSAgICB3aW5kb3cuc2V0V2lkdGgobWluKG1heChtaW5pbXVtU2l6ZS53aWR0aCgpLCB3 aW5kb3cud2lkdGgoKSksIHNjcmVlbi53aWR0aCgpKSk7Ci0gICAgd2luZG93LnNldEhlaWdodCht aW4obWF4KG1pbmltdW1TaXplLmhlaWdodCgpLCB3aW5kb3cuaGVpZ2h0KCkpLCBzY3JlZW4uaGVp Z2h0KCkpKTsKKyAgICAvLyBMZXQgc2l6ZSAwIHBhc3MgdGhyb3VnaCwgc2luY2UgdGhhdCBpbmRp Y2F0ZXMgZGVmYXVsdCBzaXplLCBub3QgbWluaW11bSBzaXplLgorICAgIGlmICh3aW5kb3cud2lk dGgoKSkKKyAgICAgICAgd2luZG93LnNldFdpZHRoKG1pbihtYXgobWluaW11bVNpemUud2lkdGgo KSwgd2luZG93LndpZHRoKCkpLCBzY3JlZW4ud2lkdGgoKSkpOworICAgIGlmICh3aW5kb3cuaGVp Z2h0KCkpCisgICAgICAgIHdpbmRvdy5zZXRIZWlnaHQobWluKG1heChtaW5pbXVtU2l6ZS5oZWln aHQoKSwgd2luZG93LmhlaWdodCgpKSwgc2NyZWVuLmhlaWdodCgpKSk7CiAKICAgICAvLyBDb25z dHJhaW4gdGhlIHdpbmRvdyBwb3NpdGlvbiB3aXRoaW4gdGhlIHZhbGlkIHNjcmVlbiBhcmVhLgog ICAgIHdpbmRvdy5zZXRYKG1heChzY3JlZW4ueCgpLCBtaW4od2luZG93LngoKSwgc2NyZWVuLm1h eFgoKSAtIHdpbmRvdy53aWR0aCgpKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90 ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x d2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCmluZGV4IDI4NTNkNjAwYTJmMTVmYmRjMjZiYWQ1MTJh N2ZlNThjMjM4ODg0MjUuLmFhZTNiYmNjYTQyMmE5NmEyYTAwYzEyYTNkMWM1N2UzM2UxZmJlMmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5j cHAKQEAgLTE4Niw2ICsxODYsNyBAQCBwcml2YXRlIFFfU0xPVFM6CiAgICAgdm9pZCByZW5kZXJP blJlcGFpbnRSZXF1ZXN0ZWRTaG91bGROb3RSZWN1cnNlKCk7CiAgICAgdm9pZCBsb2FkU2lnbmFs c09yZGVyX2RhdGEoKTsKICAgICB2b2lkIGxvYWRTaWduYWxzT3JkZXIoKTsKKyAgICB2b2lkIG9w ZW5XaW5kb3dEZWZhdWx0U2l6ZSgpOwogCiAjaWZkZWYgUV9PU19NQUMKICAgICB2b2lkIG1hY0Nv cHlVbmljb2RlVG9DbGlwYm9hcmQoKTsKQEAgLTQxMCwxMCArNDExLDEzIEBAIHZvaWQgdHN0X1FX ZWJQYWdlOjpjb25zb2xlT3V0cHV0KCkKICAgICBRQ09NUEFSRShwYWdlLmxpbmVOdW1iZXJzLmF0 KDApLCAxKTsKIH0KIAotY2xhc3MgVGVzdFBhZ2UgOiBwdWJsaWMgUVdlYlBhZ2UKLXsKK2NsYXNz IFRlc3RQYWdlIDogcHVibGljIFFXZWJQYWdlIHsKKyAgICBRX09CSkVDVAogcHVibGljOgotICAg IFRlc3RQYWdlKFFPYmplY3QqIHBhcmVudCA9IDApIDogUVdlYlBhZ2UocGFyZW50KSB7fQorICAg IFRlc3RQYWdlKFFPYmplY3QqIHBhcmVudCA9IDApIDogUVdlYlBhZ2UocGFyZW50KQorICAgIHsK KyAgICAgICAgY29ubmVjdCh0aGlzLCBTSUdOQUwoZ2VvbWV0cnlDaGFuZ2VSZXF1ZXN0ZWQoUVJl Y3QpKSwgdGhpcywgU0xPVChzbG90R2VvbWV0cnlDaGFuZ2VSZXF1ZXN0ZWQoUVJlY3QpKSk7Cisg ICAgfQogCiAgICAgc3RydWN0IE5hdmlnYXRpb24gewogICAgICAgICBRUG9pbnRlcjxRV2ViRnJh bWU+IGZyYW1lOwpAQCAtNDIyLDcgKzQyNiw4IEBAIHB1YmxpYzoKICAgICB9OwogCiAgICAgUUxp c3Q8TmF2aWdhdGlvbj4gbmF2aWdhdGlvbnM7Ci0gICAgUUxpc3Q8UVdlYlBhZ2UqPiBjcmVhdGVk V2luZG93czsKKyAgICBRTGlzdDxUZXN0UGFnZSo+IGNyZWF0ZWRXaW5kb3dzOworICAgIFFSZWN0 IHJlcXVlc3RlZEdlb21ldHJ5OwogCiAgICAgdmlydHVhbCBib29sIGFjY2VwdE5hdmlnYXRpb25S ZXF1ZXN0KFFXZWJGcmFtZSogZnJhbWUsIGNvbnN0IFFOZXR3b3JrUmVxdWVzdCAmcmVxdWVzdCwg TmF2aWdhdGlvblR5cGUgdHlwZSkgewogICAgICAgICBOYXZpZ2F0aW9uIG47CkBAIC00MzQsMTAg KzQzOSwxNSBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgdmlydHVhbCBRV2ViUGFnZSogY3JlYXRl V2luZG93KFdlYldpbmRvd1R5cGUpIHsKLSAgICAgICAgUVdlYlBhZ2UqIHBhZ2UgPSBuZXcgVGVz dFBhZ2UodGhpcyk7CisgICAgICAgIFRlc3RQYWdlKiBwYWdlID0gbmV3IFRlc3RQYWdlKHRoaXMp OwogICAgICAgICBjcmVhdGVkV2luZG93cy5hcHBlbmQocGFnZSk7CiAgICAgICAgIHJldHVybiBw YWdlOwogICAgIH0KKworcHJpdmF0ZSBRX1NMT1RTOgorICAgIHZvaWQgc2xvdEdlb21ldHJ5Q2hh bmdlUmVxdWVzdGVkKGNvbnN0IFFSZWN0JiBnZW9tKSB7CisgICAgICAgIHJlcXVlc3RlZEdlb21l dHJ5ID0gZ2VvbTsKKyAgICB9CiB9OwogCiB2b2lkIHRzdF9RV2ViUGFnZTo6cG9wdXBGb3JtU3Vi bWlzc2lvbigpCkBAIC0zMjUzLDUgKzMyNjMsMjkgQEAgdm9pZCB0c3RfUVdlYlBhZ2U6OnVuZG9B Y3Rpb25IYXZlQ3VzdG9tVGV4dCgpCiAgICAgUVZFUklGWSh0eXBpbmdBY3Rpb25UZXh0ICE9IGFs aWduQWN0aW9uVGV4dCk7CiB9CiAKK3ZvaWQgdHN0X1FXZWJQYWdlOjpvcGVuV2luZG93RGVmYXVs dFNpemUoKQoreworICAgIFRlc3RQYWdlIHBhZ2U7CisgICAgcGFnZS5zZXR0aW5ncygpLT5zZXRB dHRyaWJ1dGUoUVdlYlNldHRpbmdzOjpKYXZhc2NyaXB0Q2FuT3BlbldpbmRvd3MsIHRydWUpOwor ICAgIC8vIE9wZW4gYSBkZWZhdWx0IHdpbmRvdy4KKyAgICBwYWdlLm1haW5GcmFtZSgpLT5ldmFs dWF0ZUphdmFTY3JpcHQoIndpbmRvdy5vcGVuKCkiKTsKKyAgICAvLyBPcGVuIGEgdG9vIHNtYWxs IHdpbmRvdy4KKyAgICBwYWdlLm1haW5GcmFtZSgpLT5ldmFsdWF0ZUphdmFTY3JpcHQoIndpbmRv dy5vcGVuKCcnLCAnJywgJ3dpZHRoPTEwLGhlaWdodD0xMCcpIik7CisKKyAgICBRVGVzdDo6cVdh aXQoNTAwKTsKKyAgICAvLyBUaGUgbnVtYmVyIG9mIHBvcHVwcyBjcmVhdGVkIHNob3VsZCBiZSB0 d28uCisgICAgUVZFUklGWShwYWdlLmNyZWF0ZWRXaW5kb3dzLnNpemUoKSA9PSAyKTsKKworICAg IFFSZWN0IHJlcXVlc3RlZEdlb21ldHJ5ID0gcGFnZS5jcmVhdGVkV2luZG93c1swXS0+cmVxdWVz dGVkR2VvbWV0cnk7CisgICAgLy8gQ2hlY2sgZGVmYXVsdCBzaXplIGhhcyBiZWVuIHJlcXVlc3Rl ZC4KKyAgICBRVkVSSUZZKHJlcXVlc3RlZEdlb21ldHJ5LndpZHRoKCkgPT0gMCk7CisgICAgUVZF UklGWShyZXF1ZXN0ZWRHZW9tZXRyeS5oZWlnaHQoKSA9PSAwKTsKKworICAgIHJlcXVlc3RlZEdl b21ldHJ5ID0gcGFnZS5jcmVhdGVkV2luZG93c1sxXS0+cmVxdWVzdGVkR2VvbWV0cnk7CisgICAg Ly8gQ2hlY2sgbWluaW11bSBzaXplIGhhcyBiZWVuIHJlcXVlc3RlZC4KKyAgICBRVkVSSUZZKHJl cXVlc3RlZEdlb21ldHJ5LndpZHRoKCkgPT0gMTAwKTsKKyAgICBRVkVSSUZZKHJlcXVlc3RlZEdl b21ldHJ5LmhlaWdodCgpID09IDEwMCk7Cit9CisKIFFURVNUX01BSU4odHN0X1FXZWJQYWdlKQog I2luY2x1ZGUgInRzdF9xd2VicGFnZS5tb2MiCg== 186857 2013-02-06 08:08:27 -0800 2013-02-13 09:23:21 -0800 Patch bug-107705-20130206170423.patch text/plain 9125 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWUxNDEzMjk2Y2Y4MmEx YWU1ODIzZjc4ZDNiNjQ4ZTdiMzBjNjBiZi4uOWNjNzZmOWFkOTkwOTE1YTRjY2Q5NWJlNjMxMjMy MjY2YWZjNzI2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAyLTA2ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtR dF0gd2luZG93Lm9wZW4gcGFzc2VzIGhlaWdodCBhbmQgd2lkdGggcGFyYW1ldGVycyBldmVuIGlm IG5vdCBkZWZpbmVkIGluIGEgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA3NzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRG8gbm90IG92ZXJyaWRlIHdpZHRoIG9yIGhlaWdodCBvZiAwLCBhcyB0 aGF0IGluZGljYXRlcyBkZWZhdWx0IHNpemUsIGFuZCBub3QgbWluaW11bSBzaXplLgorCisgICAg ICAgIFRlc3RlZCBieSB0c3RfcXdlYnBhZ2UuCisKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpET01XaW5kb3c6OmFkanVzdFdpbmRvd1JlY3QpOgorCiAy MDEzLTAyLTA2ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBpc1NuaXBwZXQgZmllbGQgZnJvbSBGaWxlRGVzY3Jp cHRvciBhbmQgVUlTb3VyY2VDb2RlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCmluZGV4IGQ0ODRhNzMzNThjN2Yz YWIwMWUyYzM3YTNiYTIyM2U3Njg3ZTY5ZjQuLjdkODc2YjNjNTFmN2JmNTkyYTE3NmE5YTdhZGJm MjQ0OWZiNjM0MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wMi0w NiAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQGRpZ2lhLmNvbT4KKworICAg ICAgICBbUXRdIHdpbmRvdy5vcGVuIHBhc3NlcyBoZWlnaHQgYW5kIHdpZHRoIHBhcmFtZXRlcnMg ZXZlbiBpZiBub3QgZGVmaW5lZCBpbiBhIHBhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzcwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIERvIG5vdCByZXNpemUgd2luZG93IHdoZW4gZGVmYXVsdCBz aXplIGlzIHJlcXVlc3RlZC4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEVmbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRFZmw6OnNldFdpbmRvd1Jl Y3QpOgorCiAyMDEzLTAyLTA0ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29t PgogCiAgICAgICAgIEtpbGwgc3VzcGVuZEFuaW1hdGlvbigpLCByZXN1bWVBbmltYXRpb24oKSBh bmQgbnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zKCkgZnJvbSBEUlQvV1RSOyB1c2UgSW50ZXJuYWxz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKaW5kZXggYWY5N2E1NzhjMTk0N2M3Mjk1NTdlODg3ZTViMGFkOTY1MDg3 MzliNi4uMmI5ZTM4ZTE4MTA3MjE1MDllZjkxMDYzMmRiM2Q4ODUwZjE2NzU5MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTA2ICBBbGxhbiBTYW5kZmVsZCBKZW5z ZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgorCisgICAgICAgIFtRdF0gd2luZG93Lm9wZW4g cGFzc2VzIGhlaWdodCBhbmQgd2lkdGggcGFyYW1ldGVycyBldmVuIGlmIG5vdCBkZWZpbmVkIGlu IGEgcGFnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA3NzA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg RG8gbm90IHJlc2l6ZSB3aW5kb3cgd2hlbiBkZWZhdWx0IHNpemUgaXMgcmVxdWVzdGVkLgorCisg ICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdl YktpdDo6Q2hyb21lQ2xpZW50OjpzZXRXaW5kb3dSZWN0KToKKwogMjAxMy0wMi0wNSAgTWFydGlu IFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgVXBkYXRlIHRoZSBO RVdTIGFuZCBjb25maWd1cmF0aW9uIGluIHByZXBhcmF0aW9uIGZvciAxLjExLjUuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdl TG9nCmluZGV4IGIxMjRhYTY3MGQ0ZjM3ZWU3YjY0NzNkYzJiYWRmN2JiYjU1OWQ2ZmEuLmZhOWI5 M2E4MjcyMjA5NGU3ODUxNTg1N2RlZDc4YWU4OTQ2ODkxN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTMtMDItMDYgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmpl bnNlbkBkaWdpYS5jb20+CisKKyAgICAgICAgW1F0XSB3aW5kb3cub3BlbiBwYXNzZXMgaGVpZ2h0 IGFuZCB3aWR0aCBwYXJhbWV0ZXJzIGV2ZW4gaWYgbm90IGRlZmluZWQgaW4gYSBwYWdlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc3MDUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IHRoYXQgbWlu aW11bSBzaXplIGlzIGFwcGxpZWQgb25seSB3aGVuIHRoZSByZXF1ZXN0ZWQgc2l6ZSBpcyB0b28g c21hbGwsCisgICAgICAgIG5vdCB3aGVuIGRlZmF1bHQgaXMgcmVxdWVzdGVkLgorCisgICAgICAg ICogdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKHRzdF9RV2ViUGFn ZSk6CisgICAgICAgIChUZXN0UGFnZSk6CisgICAgICAgIChUZXN0UGFnZTo6VGVzdFBhZ2UpOgor ICAgICAgICAoVGVzdFBhZ2U6OmNyZWF0ZVdpbmRvdyk6CisgICAgICAgIChUZXN0UGFnZTo6c2xv dEdlb21ldHJ5Q2hhbmdlUmVxdWVzdGVkKToKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6b3Blbldp bmRvd0RlZmF1bHRTaXplKToKKwogMjAxMy0wMi0wNCAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3Vs YWluQGFwcGxlLmNvbT4KIAogICAgICAgICBLaWxsIHN1c3BlbmRBbmltYXRpb24oKSwgcmVzdW1l QW5pbWF0aW9uKCkgYW5kIG51bWJlck9mQWN0aXZlQW5pbWF0aW9ucygpIGZyb20gRFJUL1dUUjsg dXNlIEludGVybmFscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCmluZGV4IDFjY2JmM2MwNGRl ODQ4Zjc2YmIxMTk4NDJmZjI0ZjM1Y2YzYmIwYjQuLjkxZDBjN2QzZTQ0YTA1NGVlNmYwNWJkYzIz OGY3YTU2MWVkYmNiYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKQEAgLTMzOSw4ICsz MzksMTEgQEAgRmxvYXRSZWN0IERPTVdpbmRvdzo6YWRqdXN0V2luZG93UmVjdChQYWdlKiBwYWdl LCBjb25zdCBGbG9hdFJlY3QmIHBlbmRpbmdDaGFuZ2UKICAgICAgICAgd2luZG93LnNldEhlaWdo dChwZW5kaW5nQ2hhbmdlcy5oZWlnaHQoKSk7CiAKICAgICBGbG9hdFNpemUgbWluaW11bVNpemUg PSBwYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPm1pbmltdW1XaW5kb3dTaXplKCk7Ci0gICAgd2lu ZG93LnNldFdpZHRoKG1pbihtYXgobWluaW11bVNpemUud2lkdGgoKSwgd2luZG93LndpZHRoKCkp LCBzY3JlZW4ud2lkdGgoKSkpOwotICAgIHdpbmRvdy5zZXRIZWlnaHQobWluKG1heChtaW5pbXVt U2l6ZS5oZWlnaHQoKSwgd2luZG93LmhlaWdodCgpKSwgc2NyZWVuLmhlaWdodCgpKSk7CisgICAg Ly8gTGV0IHNpemUgMCBwYXNzIHRocm91Z2gsIHNpbmNlIHRoYXQgaW5kaWNhdGVzIGRlZmF1bHQg c2l6ZSwgbm90IG1pbmltdW0gc2l6ZS4KKyAgICBpZiAod2luZG93LndpZHRoKCkpCisgICAgICAg IHdpbmRvdy5zZXRXaWR0aChtaW4obWF4KG1pbmltdW1TaXplLndpZHRoKCksIHdpbmRvdy53aWR0 aCgpKSwgc2NyZWVuLndpZHRoKCkpKTsKKyAgICBpZiAod2luZG93LmhlaWdodCgpKQorICAgICAg ICB3aW5kb3cuc2V0SGVpZ2h0KG1pbihtYXgobWluaW11bVNpemUuaGVpZ2h0KCksIHdpbmRvdy5o ZWlnaHQoKSksIHNjcmVlbi5oZWlnaHQoKSkpOwogCiAgICAgLy8gQ29uc3RyYWluIHRoZSB3aW5k b3cgcG9zaXRpb24gd2l0aGluIHRoZSB2YWxpZCBzY3JlZW4gYXJlYS4KICAgICB3aW5kb3cuc2V0 WChtYXgoc2NyZWVuLngoKSwgbWluKHdpbmRvdy54KCksIHNjcmVlbi5tYXhYKCkgLSB3aW5kb3cu d2lkdGgoKSkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9D aHJvbWVDbGllbnRFZmwuY3BwCmluZGV4IDcyMWRhOTVlMWNhZThlNTk1YmFmN2I3Y2VlNzY0N2M2 ZTE0MTFhNzUuLmViZWE0MjQ2MDcwNjBkMDc4Mzk5Y2I5Y2ViNDE0MDFmMTBmMzE5MTMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZs LmNwcApAQCAtMTI4LDcgKzEyOCw3IEBAIEZsb2F0UmVjdCBDaHJvbWVDbGllbnRFZmw6OndpbmRv d1JlY3QoKQogCiB2b2lkIENocm9tZUNsaWVudEVmbDo6c2V0V2luZG93UmVjdChjb25zdCBGbG9h dFJlY3QmIHJlY3QpCiB7Ci0gICAgaWYgKCFld2tfdmlld19zZXR0aW5nX2VuYWJsZV9hdXRvX3Jl c2l6ZV93aW5kb3dfZ2V0KG1fdmlldykpCisgICAgaWYgKCFld2tfdmlld19zZXR0aW5nX2VuYWJs ZV9hdXRvX3Jlc2l6ZV93aW5kb3dfZ2V0KG1fdmlldykgfHwgcmVjdC5pc0VtcHR5KCkpCiAgICAg ICAgIHJldHVybjsKIAogICAgIEVjb3JlX0V2YXMqIGVlID0gZWNvcmVfZXZhc19lY29yZV9ldmFz X2dldChldmFzX29iamVjdF9ldmFzX2dldChtX3ZpZXcpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCmluZGV4IDY3MGY2NDUw YzYxN2E2ZWFmMzVmM2Y4MmNiNDY4NjY4ZjM1MTljOTguLmRiZGI3ZGQ2ZGM3YjljMDhlOTNjM2Qy NjRjMjNkNzJmOWUxYzE0MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVT dXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29y ZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcApAQCAtMTQyLDcgKzE0Miw4IEBAIHZvaWQgQ2hy b21lQ2xpZW50OjpzZXRXaW5kb3dSZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKICAgICBHdGtX aWRnZXQqIHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKEdUS19XSURHRVQobV93ZWJW aWV3KSk7CiAgICAgaWYgKHdpZGdldElzT25zY3JlZW5Ub3BsZXZlbFdpbmRvdyh3aW5kb3cpKSB7 CiAgICAgICAgIGd0a193aW5kb3dfbW92ZShHVEtfV0lORE9XKHdpbmRvdyksIGludHJlY3QueCgp LCBpbnRyZWN0LnkoKSk7Ci0gICAgICAgIGd0a193aW5kb3dfcmVzaXplKEdUS19XSU5ET1cod2lu ZG93KSwgaW50cmVjdC53aWR0aCgpLCBpbnRyZWN0LmhlaWdodCgpKTsKKyAgICAgICAgaWYgKCFp bnRyZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIGd0a193aW5kb3dfcmVzaXplKEdUS19XSU5E T1cod2luZG93KSwgaW50cmVjdC53aWR0aCgpLCBpbnRyZWN0LmhlaWdodCgpKTsKICAgICB9CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJw YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNw cAppbmRleCA2N2MyN2Y1OTk2MTdkOGM2ODE1ZjQwNDY1ZWEyMzU5ZTg1ZGEwZmNhLi4yYjEzZTNl MzU5M2QzMTg0NWZkMGQxODU3NzRkYjJiZmQ3MGU3OTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCkBAIC0xODYsNiArMTg2LDcgQEAg cHJpdmF0ZSBRX1NMT1RTOgogICAgIHZvaWQgcmVuZGVyT25SZXBhaW50UmVxdWVzdGVkU2hvdWxk Tm90UmVjdXJzZSgpOwogICAgIHZvaWQgbG9hZFNpZ25hbHNPcmRlcl9kYXRhKCk7CiAgICAgdm9p ZCBsb2FkU2lnbmFsc09yZGVyKCk7CisgICAgdm9pZCBvcGVuV2luZG93RGVmYXVsdFNpemUoKTsK IAogI2lmZGVmIFFfT1NfTUFDCiAgICAgdm9pZCBtYWNDb3B5VW5pY29kZVRvQ2xpcGJvYXJkKCk7 CkBAIC00MTAsMTAgKzQxMSwxMyBAQCB2b2lkIHRzdF9RV2ViUGFnZTo6Y29uc29sZU91dHB1dCgp CiAgICAgUUNPTVBBUkUocGFnZS5saW5lTnVtYmVycy5hdCgwKSwgMSk7CiB9CiAKLWNsYXNzIFRl c3RQYWdlIDogcHVibGljIFFXZWJQYWdlCi17CitjbGFzcyBUZXN0UGFnZSA6IHB1YmxpYyBRV2Vi UGFnZSB7CisgICAgUV9PQkpFQ1QKIHB1YmxpYzoKLSAgICBUZXN0UGFnZShRT2JqZWN0KiBwYXJl bnQgPSAwKSA6IFFXZWJQYWdlKHBhcmVudCkge30KKyAgICBUZXN0UGFnZShRT2JqZWN0KiBwYXJl bnQgPSAwKSA6IFFXZWJQYWdlKHBhcmVudCkKKyAgICB7CisgICAgICAgIGNvbm5lY3QodGhpcywg U0lHTkFMKGdlb21ldHJ5Q2hhbmdlUmVxdWVzdGVkKFFSZWN0KSksIHRoaXMsIFNMT1Qoc2xvdEdl b21ldHJ5Q2hhbmdlUmVxdWVzdGVkKFFSZWN0KSkpOworICAgIH0KIAogICAgIHN0cnVjdCBOYXZp Z2F0aW9uIHsKICAgICAgICAgUVBvaW50ZXI8UVdlYkZyYW1lPiBmcmFtZTsKQEAgLTQyMiw3ICs0 MjYsOCBAQCBwdWJsaWM6CiAgICAgfTsKIAogICAgIFFMaXN0PE5hdmlnYXRpb24+IG5hdmlnYXRp b25zOwotICAgIFFMaXN0PFFXZWJQYWdlKj4gY3JlYXRlZFdpbmRvd3M7CisgICAgUUxpc3Q8VGVz dFBhZ2UqPiBjcmVhdGVkV2luZG93czsKKyAgICBRUmVjdCByZXF1ZXN0ZWRHZW9tZXRyeTsKIAog ICAgIHZpcnR1YWwgYm9vbCBhY2NlcHROYXZpZ2F0aW9uUmVxdWVzdChRV2ViRnJhbWUqIGZyYW1l LCBjb25zdCBRTmV0d29ya1JlcXVlc3QgJnJlcXVlc3QsIE5hdmlnYXRpb25UeXBlIHR5cGUpIHsK ICAgICAgICAgTmF2aWdhdGlvbiBuOwpAQCAtNDM0LDEwICs0MzksMTUgQEAgcHVibGljOgogICAg IH0KIAogICAgIHZpcnR1YWwgUVdlYlBhZ2UqIGNyZWF0ZVdpbmRvdyhXZWJXaW5kb3dUeXBlKSB7 Ci0gICAgICAgIFFXZWJQYWdlKiBwYWdlID0gbmV3IFRlc3RQYWdlKHRoaXMpOworICAgICAgICBU ZXN0UGFnZSogcGFnZSA9IG5ldyBUZXN0UGFnZSh0aGlzKTsKICAgICAgICAgY3JlYXRlZFdpbmRv d3MuYXBwZW5kKHBhZ2UpOwogICAgICAgICByZXR1cm4gcGFnZTsKICAgICB9CisKK3ByaXZhdGUg UV9TTE9UUzoKKyAgICB2b2lkIHNsb3RHZW9tZXRyeUNoYW5nZVJlcXVlc3RlZChjb25zdCBRUmVj dCYgZ2VvbSkgeworICAgICAgICByZXF1ZXN0ZWRHZW9tZXRyeSA9IGdlb207CisgICAgfQogfTsK IAogdm9pZCB0c3RfUVdlYlBhZ2U6OnBvcHVwRm9ybVN1Ym1pc3Npb24oKQpAQCAtMzI1Miw1ICsz MjYyLDI5IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjp1bmRvQWN0aW9uSGF2ZUN1c3RvbVRleHQoKQog ICAgIFFWRVJJRlkodHlwaW5nQWN0aW9uVGV4dCAhPSBhbGlnbkFjdGlvblRleHQpOwogfQogCit2 b2lkIHRzdF9RV2ViUGFnZTo6b3BlbldpbmRvd0RlZmF1bHRTaXplKCkKK3sKKyAgICBUZXN0UGFn ZSBwYWdlOworICAgIHBhZ2Uuc2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6 SmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzLCB0cnVlKTsKKyAgICAvLyBPcGVuIGEgZGVmYXVsdCB3 aW5kb3cuCisgICAgcGFnZS5tYWluRnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJ3aW5kb3cu b3BlbigpIik7CisgICAgLy8gT3BlbiBhIHRvbyBzbWFsbCB3aW5kb3cuCisgICAgcGFnZS5tYWlu RnJhbWUoKS0+ZXZhbHVhdGVKYXZhU2NyaXB0KCJ3aW5kb3cub3BlbignJywgJycsICd3aWR0aD0x MCxoZWlnaHQ9MTAnKSIpOworCisgICAgUVRlc3Q6OnFXYWl0KDUwMCk7CisgICAgLy8gVGhlIG51 bWJlciBvZiBwb3B1cHMgY3JlYXRlZCBzaG91bGQgYmUgdHdvLgorICAgIFFWRVJJRlkocGFnZS5j cmVhdGVkV2luZG93cy5zaXplKCkgPT0gMik7CisKKyAgICBRUmVjdCByZXF1ZXN0ZWRHZW9tZXRy eSA9IHBhZ2UuY3JlYXRlZFdpbmRvd3NbMF0tPnJlcXVlc3RlZEdlb21ldHJ5OworICAgIC8vIENo ZWNrIGRlZmF1bHQgc2l6ZSBoYXMgYmVlbiByZXF1ZXN0ZWQuCisgICAgUVZFUklGWShyZXF1ZXN0 ZWRHZW9tZXRyeS53aWR0aCgpID09IDApOworICAgIFFWRVJJRlkocmVxdWVzdGVkR2VvbWV0cnku aGVpZ2h0KCkgPT0gMCk7CisKKyAgICByZXF1ZXN0ZWRHZW9tZXRyeSA9IHBhZ2UuY3JlYXRlZFdp bmRvd3NbMV0tPnJlcXVlc3RlZEdlb21ldHJ5OworICAgIC8vIENoZWNrIG1pbmltdW0gc2l6ZSBo YXMgYmVlbiByZXF1ZXN0ZWQuCisgICAgUVZFUklGWShyZXF1ZXN0ZWRHZW9tZXRyeS53aWR0aCgp ID09IDEwMCk7CisgICAgUVZFUklGWShyZXF1ZXN0ZWRHZW9tZXRyeS5oZWlnaHQoKSA9PSAxMDAp OworfQorCiBRVEVTVF9NQUlOKHRzdF9RV2ViUGFnZSkKICNpbmNsdWRlICJ0c3RfcXdlYnBhZ2Uu bW9jIgo=