72161 2011-11-11 11:40:43 -0800 [Qt][WK2] Implement loadHtml API for QQuickWebView 2011-11-21 09:39:08 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 jesus jesus cmarcelo webkit.review.bot zoltan oldest_to_newest 500975 0 jesus 2011-11-11 11:40:43 -0800 QQuickWebView needs QQuickWebView::setHtml(const QString &html, const QUrl& baseUrl) . 500983 1 114749 jesus 2011-11-11 11:48:45 -0800 Created attachment 114749 Patch 500994 2 114749 cmarcelo 2011-11-11 12:07:01 -0800 Comment on attachment 114749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114749&action=review > Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp:718 > + WKRetainPtr<WKStringRef> wkHtmlString(WKStringCreateWithUTF8CString(html.toUtf8().constData())); I think we have a WKStringCreateWithQString in WKStringQt.h or similar. 501000 3 jesus 2011-11-11 12:23:06 -0800 (In reply to comment #2) > (From update of attachment 114749 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=114749&action=review > > > Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp:718 > > + WKRetainPtr<WKStringRef> wkHtmlString(WKStringCreateWithUTF8CString(html.toUtf8().constData())); > > I think we have a WKStringCreateWithQString in WKStringQt.h or similar. We do, but I was unsure of the conversions... 501527 4 114749 hausmann 2011-11-13 11:13:20 -0800 Comment on attachment 114749 Patch <bikeshed> I feel that perhaps we should change our "tactics" and use loadHTML instead of setHTML to emphasize the fact that this function is very async in its behavior. Also it would be nice to start introducing documentation for newly added functions :) 501844 5 cmarcelo 2011-11-14 06:02:54 -0800 (In reply to comment #4) > (From update of attachment 114749 [details]) > <bikeshed> I feel that perhaps we should change our "tactics" and use loadHTML instead of setHTML to emphasize the fact that this function is very async in its behavior. That's a good idea, Simon. 501854 6 114749 cmarcelo 2011-11-14 06:15:23 -0800 Comment on attachment 114749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114749&action=review >>> Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp:718 >>> + WKRetainPtr<WKStringRef> wkHtmlString(WKStringCreateWithUTF8CString(html.toUtf8().constData())); >> >> I think we have a WKStringCreateWithQString in WKStringQt.h or similar. > > We do, but I was unsure of the conversions... It is fine to use WKStringCreateWithQString here. Because of the internal representation of wtf String (can use 16 bit char, WKString/WebString are wrappers to wtf String) and QString (uses 16 bit char) we'll even do less conversions. :-) 503792 7 115362 jesus 2011-11-16 05:54:39 -0800 Created attachment 115362 Patch 503794 8 115362 cmarcelo 2011-11-16 05:59:06 -0800 Comment on attachment 115362 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115362&action=review LGTM with a few style comments. > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:506 > +void QQuickWebView::loadHtml(const QString &html, const QUrl& baseUrl) Style. > Source/WebKit2/UIProcess/API/qt/qquickwebview.h:99 > + void loadHtml(const QString &html, const QUrl& baseUrl = QUrl()); Style. > Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_loadHtml.qml:20 > + id: spy Minor: "linkSpy"? "linkHoveredSpy"? > Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro:29 > + DesktopBehavior/tst_loadHtml.qml Do we need tests for both cases? I think WebView one suffices. > Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp:716 > +void QtWebPageProxy::loadHTMLString(const QString &html, const QUrl &baseUrl) Style. > Source/WebKit2/UIProcess/qt/QtWebPageProxy.h:164 > + void loadHTMLString(const QString &html, const QUrl &baseUrl); Style. 503796 9 115362 cmarcelo 2011-11-16 06:00:45 -0800 Comment on attachment 115362 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115362&action=review >> Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro:29 >> + DesktopBehavior/tst_loadHtml.qml > > Do we need tests for both cases? I think WebView one suffices. Ignore this. Jesus just explained me here that link hovered is only available when using Desktop Behaviour. 503803 10 115365 jesus 2011-11-16 06:11:42 -0800 Created attachment 115365 Patch 503805 11 jesus 2011-11-16 06:13:04 -0800 (In reply to comment #8) > Style. Fixed. Fooled by check-webkit-style... =/ > Do we need tests for both cases? I think WebView one suffices. > Ignore this. Jesus just explained me here that link hovered is only available when using Desktop Behaviour. Ditto! 505551 12 115365 hausmann 2011-11-18 00:03:39 -0800 Comment on attachment 115365 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115365&action=review r=me > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:502 > + The \a html is loaded immediately; external objects are loaded asynchronously. Hmm, how do we quantify immediately? It starts with an async message to the web process :) I'd rather leave that part out from the documentation tbh. 507019 13 jesus 2011-11-21 09:16:23 -0800 Committed r100923: <http://trac.webkit.org/changeset/100923> 114749 2011-11-11 11:48:45 -0800 2011-11-16 05:54:32 -0800 Patch bug-72161-20111111164827.patch text/plain 7290 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogOTk5NjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjNmVhNmI0NzE5OGU0Njli MGI2NDEwODM5ODBlMDk3ODE4MjM5N2RjLi5mYTQ5NDEyZDNjMTgwZTgzOTVlYmI1NWY4NmMyODMy YzA3MjU0YmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTEtMTEgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFtRdF1bV0syXSBJbXBsZW1lbnQgc2V0SHRtbCBBUEkgZm9yIFFRdWlja1dlYlZpZXcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyMTYxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50IFFR dWlja1dlYlZpZXc6OnNldEh0bWwgdGhhdCBjYWxscyBRdFdlYlBhZ2VQcm94eTo6bG9hZEhUTUxT dHJpbmcuCisgICAgICAgIFRoaXMgZnVuY3Rpb24gd2lsbCB1c2UgV0tQYWdlTG9hZEhUTUxTdHJp bmcgaW4gb3JkZXIgdG8gbG9hZCBIVE1MIGZyb20gYSBnaXZlbiBzdHJpbmcuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNrV2Vi Vmlldzo6c2V0SHRtbCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3 Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNrdG9wV2Vi Vmlldy90c3Rfc2V0SHRtbC5xbWw6IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQv dGVzdHMvcW1sdGVzdHMvcW1sdGVzdHMucHJvOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdl YlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6bG9hZEhUTUxTdHJpbmcp OgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oOgorCiAyMDExLTExLTEx ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAg IFtRdF0gQWRkIGEgd2F5IHRvIGhhdmUgZXhwZXJpbWVudGFsIGZlYXR1cmVzIGluIFdlYktpdDIK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmll dy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3Bw CmluZGV4IDEyMzA3YjJhYjhjMWU4ZWM2MmY5MDMyNDRmZmI0ODM5N2E0MTlmNDIuLjlmM2ExMjM3 NjRiMDkyNTdlOTA1NjBlZWVjZGIwODNhNDdmYjgwODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcApAQCAtNDk0LDUgKzQ5NCwxMSBA QCBXS1BhZ2VSZWYgUVF1aWNrV2ViVmlldzo6cGFnZVJlZigpIGNvbnN0CiAgICAgcmV0dXJuIGQt PnBhZ2VQcm94eS0+cGFnZVJlZigpOwogfQogCit2b2lkIFFRdWlja1dlYlZpZXc6OnNldEh0bWwo Y29uc3QgUVN0cmluZyAmaHRtbCwgY29uc3QgUVVybCYgYmFzZVVybCkKK3sKKyAgICBRX0QoUVF1 aWNrV2ViVmlldyk7CisgICAgZC0+cGFnZVByb3h5LT5sb2FkSFRNTFN0cmluZyhodG1sLCBiYXNl VXJsKTsKK30KKwogI2luY2x1ZGUgIm1vY19xcXVpY2t3ZWJ2aWV3LmNwcCIKICNpbmNsdWRlICJt b2NfcXF1aWNrd2Vidmlld19wLmNwcCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9xdC9xcXVpY2t3ZWJ2aWV3LmgKaW5kZXggZjhiYTgxN2ExZjM3NTE5NDM1NDlhM2NlMDA4ZjEy ODU2ODkzNjA3My4uMDEyZjczMjViMjIwOTJiMjY2Y2RjYzdmZjg3ZDlkNWU3ZDk5MGJiYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmgKQEAg LTk2LDYgKzk2LDggQEAgcHVibGljIFFfU0xPVFM6CiAgICAgdm9pZCBzdG9wKCk7CiAgICAgdm9p ZCByZWxvYWQoKTsKIAorICAgIHZvaWQgc2V0SHRtbChjb25zdCBRU3RyaW5nICZodG1sLCBjb25z dCBRVXJsJiBiYXNlVXJsID0gUVVybCgpKTsKKwogUV9TSUdOQUxTOgogICAgIHZvaWQgdGl0bGVD aGFuZ2VkKGNvbnN0IFFTdHJpbmcmIHRpdGxlKTsKICAgICB2b2lkIHN0YXR1c0Jhck1lc3NhZ2VD aGFuZ2VkKGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNrdG9wV2ViVmlldy90c3Rfc2V0 SHRtbC5xbWwgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3Rz L0Rlc2t0b3BXZWJWaWV3L3RzdF9zZXRIdG1sLnFtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kNWRkZmEyNjk3NDE3 MzlhNDNiYjJmZDA5NTM5MzUwYzFkYzEzMmI4Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNrdG9wV2ViVmlldy90c3Rf c2V0SHRtbC5xbWwKQEAgLTAsMCArMSw3MSBAQAoraW1wb3J0IFF0UXVpY2sgMi4wCitpbXBvcnQg UXRUZXN0IDEuMAoraW1wb3J0IFF0V2ViS2l0IDMuMAoraW1wb3J0IFF0V2ViS2l0VGVzdCAxLjAK KworRGVza3RvcFdlYlZpZXcgeworICAgIGlkOiB3ZWJWaWV3CisgICAgd2lkdGg6IDIwMAorICAg IGhlaWdodDogNDAwCisKKyAgICBwcm9wZXJ0eSBzdHJpbmcgbGFzdFVybAorCisgICAgU2lnbmFs U3B5IHsKKyAgICAgICAgaWQ6IGxvYWRTcHkKKyAgICAgICAgdGFyZ2V0OiB3ZWJWaWV3CisgICAg ICAgIHNpZ25hbE5hbWU6ICJsb2FkU3VjY2VlZGVkIgorICAgIH0KKworICAgIFNpZ25hbFNweSB7 CisgICAgICAgIGlkOiBzcHkKKyAgICAgICAgdGFyZ2V0OiB3ZWJWaWV3CisgICAgICAgIHNpZ25h bE5hbWU6ICJsaW5rSG92ZXJlZCIKKyAgICB9CisKKyAgICBvbkxpbmtIb3ZlcmVkOiB7CisgICAg ICAgIHdlYlZpZXcubGFzdFVybCA9IHVybAorICAgIH0KKworICAgIFRlc3RDYXNlIHsKKyAgICAg ICAgbmFtZTogIkRlc2t0b3BXZWJWaWV3U2V0SHRtbCIKKworICAgICAgICAvLyBEZWxheWVkIHdp bmRvd1Nob3duIHRvIHdvcmthcm91bmQgcHJvYmxlbXMgd2l0aCBRdDUgaW4gZGVidWcgbW9kZS4K KyAgICAgICAgd2hlbjogZmFsc2UKKyAgICAgICAgVGltZXIgeworICAgICAgICAgICAgcnVubmlu ZzogcGFyZW50LndpbmRvd1Nob3duCisgICAgICAgICAgICByZXBlYXQ6IGZhbHNlCisgICAgICAg ICAgICBpbnRlcnZhbDogMQorICAgICAgICAgICAgb25UcmlnZ2VyZWQ6IHBhcmVudC53aGVuID0g dHJ1ZQorICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gaW5pdCgpIHsKKyAgICAgICAgICAg IHdlYlZpZXcubGFzdFVybCA9ICIiCisgICAgICAgICAgICBzcHkuY2xlYXIoKQorICAgICAgICAg ICAgbG9hZFNweS5jbGVhcigpCisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiB0ZXN0X2Fs b2FkUHJvZ3Jlc3NBZnRlclNldEh0bWwoKSB7CisgICAgICAgICAgICBsb2FkU3B5LmNsZWFyKCkK KyAgICAgICAgICAgIHNweS5jbGVhcigpCisgICAgICAgICAgICBjb21wYXJlKGxvYWRTcHkuY291 bnQsIDApCisgICAgICAgICAgICBjb21wYXJlKHdlYlZpZXcubG9hZFByb2dyZXNzLCAwKQorICAg ICAgICAgICAgd2ViVmlldy5zZXRIdG1sKCI8aHRtbD48aGVhZD48dGl0bGU+VGVzdCBwYWdlIDE8 L3RpdGxlPjwvaGVhZD48Ym9keT5IZWxsby48L2JvZHk+PC9odG1sPiIpCisgICAgICAgICAgICBj b21wYXJlKHdlYlZpZXcubG9hZFByb2dyZXNzLCAwKQorICAgICAgICAgICAgbG9hZFNweS53YWl0 KCkKKyAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy5sb2FkUHJvZ3Jlc3MsIDEwMCkKKyAgICAg ICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHRlc3RfYmFzZVVybEFmdGVyU2V0SHRtbCgpIHsKKyAg ICAgICAgICAgIGxvYWRTcHkuY2xlYXIoKQorICAgICAgICAgICAgc3B5LmNsZWFyKCkKKyAgICAg ICAgICAgIGNvbXBhcmUoc3B5LmNvdW50LCAwKQorICAgICAgICAgICAgd2ViVmlldy5zZXRIdG1s KCI8aHRtbD48aGVhZD48dGl0bGU+VGVzdCBwYWdlIHdpdGggaHVnZSBsaW5rIGFyZWE8L3RpdGxl PjwvaGVhZD48Ym9keT48YSB0aXRsZT1cIkEgdGl0bGVcIiBocmVmPVwidGVzdDEuaHRtbFwiPjxp bWcgd2lkdGg9MjAwIGhlaWdodD0yMDA+PC9hPjwvYm9keT48L2h0bWw+IiwgImh0dHA6Ly93d3cu ZXhhbXBsZS5mb28uY29tIikKKyAgICAgICAgICAgIGxvYWRTcHkud2FpdCgpCisgICAgICAgICAg ICBjb21wYXJlKCJodHRwOi8vd3d3LmV4YW1wbGUuZm9vLmNvbS8iLCB3ZWJWaWV3LnVybCkKKyAg ICAgICAgICAgIG1vdXNlTW92ZSh3ZWJWaWV3LCAxMDAsIDEwMCkKKyAgICAgICAgICAgIHNweS53 YWl0KCkKKyAgICAgICAgICAgIGNvbXBhcmUoc3B5LmNvdW50LCAxKQorICAgICAgICAgICAgY29t cGFyZSh3ZWJWaWV3Lmxhc3RVcmwsICJodHRwOi8vd3d3LmV4YW1wbGUuZm9vLmNvbS90ZXN0MS5o dG1sIikKKyAgICAgICAgfQorICAgIH0KK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvcW1sdGVzdHMucHJvIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9xbWx0ZXN0cy5wcm8KaW5kZXggYjY2 NDdiMDdkMWNiMjNiOTA3OWRmNmNhMTMyYTFmYWMyNjJlNTZkMi4uOGM2NzY3NzJlY2U4YTc5NGQ5 ZTNiODVmZjE0NzY0ZmNiZTQ2NGM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9xbWx0ZXN0cy5wcm8KKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9xbWx0ZXN0cy5wcm8KQEAgLTIyLDEx ICsyMiwxMCBAQCBPVEhFUl9GSUxFUyArPSBcCiAgICAgRGVza3RvcFdlYlZpZXcvdHN0X2xpbmtI b3ZlcmVkLnFtbCBcCiAgICAgRGVza3RvcFdlYlZpZXcvdHN0X21lc3NhZ2luZy5xbWwgXAogICAg IERlc2t0b3BXZWJWaWV3L3RzdF9kb3dubG9hZC5xbWwgXAorICAgIERlc2t0b3BXZWJWaWV3L3Rz dF9zZXRIdG1sLnFtbCBcCiAgICAgVG91Y2hXZWJWaWV3L3RzdF9wcm9wZXJ0aWVzLnFtbCBcCiAg ICAgVG91Y2hXZWJWaWV3L3RzdF9sb2FkLnFtbCBcCiAgICAgVG91Y2hXZWJWaWV3L3RzdF9sb2Fk WmVyb1NpemVWaWV3LnFtbCBcCiAgICAgVG91Y2hXZWJWaWV3L3RzdF9sb2FkTmVnYXRpdmVTaXpl Vmlldy5xbWwgXAogICAgIFRvdWNoV2ViVmlldy90c3RfbG9hZFByb2dyZXNzLnFtbCBcCiAgICAg VG91Y2hXZWJWaWV3L3RzdF9sb2FkUHJvZ3Jlc3NTaWduYWwucW1sCi0KLQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKaW5kZXggMzY5MTJjMWRiYmM2 NWUyM2I1MWMwODYxMWQxZWUzMjBmMWMyOGQxMy4uN2NmOWU2NjFiNjQxMGI5ZDQ3ZmVlMzRhZmFh MmQ2OTM5YjhhY2FhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0 V2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQ YWdlUHJveHkuY3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiQ2xpZW50SW1wbC5oIgog I2luY2x1ZGUgIkRvd25sb2FkUHJveHkuaCIKICNpbmNsdWRlICJEcmF3aW5nQXJlYVByb3h5SW1w bC5oIgorI2luY2x1ZGUgIldLU3RyaW5nLmgiCiAjaW5jbHVkZSAicXdraGlzdG9yeS5oIgogI2lu Y2x1ZGUgInF3a2hpc3RvcnlfcC5oIgogI2luY2x1ZGUgIkZpbmRJbmRpY2F0b3IuaCIKQEAgLTcx MSw2ICs3MTIsMTQgQEAgdm9pZCBRdFdlYlBhZ2VQcm94eTo6cG9zdE1lc3NhZ2VUb05hdmlnYXRv clF0T2JqZWN0KGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpCiAgICAgbV9jb250ZXh0LT5wb3N0TWVz c2FnZVRvSW5qZWN0ZWRCdW5kbGUobWVzc2FnZU5hbWUsIGJvZHkuZ2V0KCkpOwogfQogCit2b2lk IFF0V2ViUGFnZVByb3h5Ojpsb2FkSFRNTFN0cmluZyhjb25zdCBRU3RyaW5nICZodG1sLCBjb25z dCBRVXJsICZiYXNlVXJsKQoreworICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a1VybChXS1VS TENyZWF0ZVdpdGhRVXJsKGJhc2VVcmwpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4g d2tIdG1sU3RyaW5nKFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGh0bWwudG9VdGY4KCku Y29uc3REYXRhKCkpKTsKKworICAgIFdLUGFnZUxvYWRIVE1MU3RyaW5nKHBhZ2VSZWYoKSwgd2tI dG1sU3RyaW5nLmdldCgpLCB3a1VybC5nZXQoKSk7Cit9CisKIHZvaWQgUXRXZWJQYWdlUHJveHk6 OmxvYWQoY29uc3QgUVVybCYgdXJsKQogewogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a3Vy bChXS1VSTENyZWF0ZVdpdGhRVXJsKHVybCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvUXRXZWJQYWdlUHJveHkuaAppbmRleCA2NmRjNDdkNjA5MjdlMDhiNDBhNzNjNTQ4ZjZmMGJl OGI0YWRmYTc2Li4xMDNkZGIwZjc3N2M3NThlY2VjMGMxNzNjMTUzNzkxNmI5MzU1MWZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaApAQCAtMTYxLDYg KzE2MSw3IEBAIHB1YmxpYzoKICAgICBXS1BhZ2VSZWYgcGFnZVJlZigpIGNvbnN0OwogCiAgICAg dm9pZCBsb2FkKGNvbnN0IFFVcmwmIHVybCk7CisgICAgdm9pZCBsb2FkSFRNTFN0cmluZyhjb25z dCBRU3RyaW5nICZodG1sLCBjb25zdCBRVXJsICZiYXNlVXJsKTsKICAgICBRVXJsIHVybCgpIGNv bnN0OwogCiAgICAgdm9pZCBzZXREcmF3aW5nQXJlYVNpemUoY29uc3QgUVNpemUmKTsK 115362 2011-11-16 05:54:39 -0800 2011-11-16 06:11:36 -0800 Patch bug-72161-20111116105423.patch text/plain 8531 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWI0N2E4MDIzMDEzYWFh NmRmMmM5NDEwNTdjY2Q0ZGFjZWFjM2U3OC4uNjhkYmJjOGRhMzczZTZhNWJjNWUzODlmOGQ5MzVm NDhjOTViNDM0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTExICBKZXN1 cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBbUXRdW1dLMl0gSW1wbGVtZW50IGxvYWRIdG1sIEFQSSBmb3IgUVF1aWNrV2ViVmlldwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIxNjEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQg UVF1aWNrV2ViVmlldzo6bG9hZEh0bWwgdGhhdCBjYWxscyBRdFdlYlBhZ2VQcm94eTo6bG9hZEhU TUxTdHJpbmcuCisgICAgICAgIFRoaXMgZnVuY3Rpb24gd2lsbCB1c2UgV0tQYWdlTG9hZEhUTUxT dHJpbmcgaW4gb3JkZXIgdG8gbG9hZCBIVE1MIGZyb20gYSBnaXZlbiBzdHJpbmcuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNr V2ViVmlldzo6bG9hZEh0bWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmll dy90c3RfbG9hZEh0bWwucW1sOiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rl c3RzL3FtbHRlc3RzL0Rlc2t0b3BCZWhhdmlvci90c3RfbG9hZEh0bWwucW1sOiBBZGRlZC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3FtbHRlc3RzLnBybzoKKyAg ICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoUXRXZWJQ YWdlUHJveHk6OmxvYWRIVE1MU3RyaW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQ YWdlUHJveHkuaDoKKwogMjAxMS0xMS0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIHdlYmtpdF93ZWJfdmlld19sb2FkX3Jl cXVlc3QoKSB0byBXZWJLaXQyIEdUSysgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCA2ZDBhNmM2MmQ3MGU3MTVmZmIwMmY1 YjRiZTc3ZTM1ZmI1ZmZkYzRhLi44MTE3NDI4MDU0MTc2YmZkZjVlZTNlZjk2MjdhYWNhNjU5ZGFh YzAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5jcHAKQEAgLTQ5Myw1ICs0OTMsMjEgQEAgV0tQYWdlUmVmIFFRdWlja1dlYlZpZXc6OnBh Z2VSZWYoKSBjb25zdAogICAgIHJldHVybiBkLT5wYWdlUHJveHktPnBhZ2VSZWYoKTsKIH0KIAor LyohCisgICAgTG9hZHMgdGhlIHNwZWNpZmllZCBcYSBodG1sIGFzIHRoZSBjb250ZW50IG9mIHRo ZSB3ZWIgdmlldy4KKworICAgIEV4dGVybmFsIG9iamVjdHMgc3VjaCBhcyBzdHlsZXNoZWV0cyBv ciBpbWFnZXMgcmVmZXJlbmNlZCBpbiB0aGUgSFRNTAorICAgIGRvY3VtZW50IGFyZSBsb2NhdGVk IHJlbGF0aXZlIHRvIFxhIGJhc2VVcmwuCisKKyAgICBUaGUgXGEgaHRtbCBpcyBsb2FkZWQgaW1t ZWRpYXRlbHk7IGV4dGVybmFsIG9iamVjdHMgYXJlIGxvYWRlZCBhc3luY2hyb25vdXNseS4KKwor ICAgIFxzYSBsb2FkKCkKKyovCit2b2lkIFFRdWlja1dlYlZpZXc6OmxvYWRIdG1sKGNvbnN0IFFT dHJpbmcgJmh0bWwsIGNvbnN0IFFVcmwmIGJhc2VVcmwpCit7CisgICAgUV9EKFFRdWlja1dlYlZp ZXcpOworICAgIGQtPnBhZ2VQcm94eS0+bG9hZEhUTUxTdHJpbmcoaHRtbCwgYmFzZVVybCk7Cit9 CisKICNpbmNsdWRlICJtb2NfcXF1aWNrd2Vidmlldy5jcHAiCiAjaW5jbHVkZSAibW9jX3FxdWlj a3dlYnZpZXdfcC5jcHAiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2Vidmlldy5oCmluZGV4IGY4YmE4MTdhMWYzNzUxOTQzNTQ5YTNjZTAwOGYxMjg1Njg5MzYw NzMuLmI0NDRjMDAwOGRhZWE0YjVhZTI1NDRmNDgyZGQ1MzFhMmRlZDc2ZWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5oCkBAIC05Niw2ICs5 Niw4IEBAIHB1YmxpYyBRX1NMT1RTOgogICAgIHZvaWQgc3RvcCgpOwogICAgIHZvaWQgcmVsb2Fk KCk7CiAKKyAgICB2b2lkIGxvYWRIdG1sKGNvbnN0IFFTdHJpbmcgJmh0bWwsIGNvbnN0IFFVcmwm IGJhc2VVcmwgPSBRVXJsKCkpOworCiBRX1NJR05BTFM6CiAgICAgdm9pZCB0aXRsZUNoYW5nZWQo Y29uc3QgUVN0cmluZyYgdGl0bGUpOwogICAgIHZvaWQgc3RhdHVzQmFyTWVzc2FnZUNoYW5nZWQo Y29uc3QgUVN0cmluZyYgbWVzc2FnZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL0Rlc2t0b3BCZWhhdmlvci90c3RfbG9hZEh0bWwu cW1sIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNr dG9wQmVoYXZpb3IvdHN0X2xvYWRIdG1sLnFtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZDliNTM3Y2NhNzY5OGZi NmFhY2FmZDI0NGQyMGIxZmRmZTEzMzA1Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNrdG9wQmVoYXZpb3IvdHN0X2xv YWRIdG1sLnFtbApAQCAtMCwwICsxLDYwIEBACitpbXBvcnQgUXRRdWljayAyLjAKK2ltcG9ydCBR dFRlc3QgMS4wCitpbXBvcnQgUXRXZWJLaXQgMy4wCitpbXBvcnQgUXRXZWJLaXRUZXN0IDEuMAor CitEZXNrdG9wV2ViVmlldyB7CisgICAgaWQ6IHdlYlZpZXcKKyAgICB3aWR0aDogMjAwCisgICAg aGVpZ2h0OiA0MDAKKworICAgIHByb3BlcnR5IHN0cmluZyBsYXN0VXJsCisKKyAgICBTaWduYWxT cHkgeworICAgICAgICBpZDogbG9hZFNweQorICAgICAgICB0YXJnZXQ6IHdlYlZpZXcKKyAgICAg ICAgc2lnbmFsTmFtZTogImxvYWRTdWNjZWVkZWQiCisgICAgfQorCisgICAgU2lnbmFsU3B5IHsK KyAgICAgICAgaWQ6IHNweQorICAgICAgICB0YXJnZXQ6IHdlYlZpZXcKKyAgICAgICAgc2lnbmFs TmFtZTogImxpbmtIb3ZlcmVkIgorICAgIH0KKworICAgIG9uTGlua0hvdmVyZWQ6IHsKKyAgICAg ICAgd2ViVmlldy5sYXN0VXJsID0gdXJsCisgICAgfQorCisgICAgVGVzdENhc2UgeworICAgICAg ICBuYW1lOiAiRGVza3RvcFdlYlZpZXdMb2FkSHRtbCIKKworICAgICAgICAvLyBEZWxheWVkIHdp bmRvd1Nob3duIHRvIHdvcmthcm91bmQgcHJvYmxlbXMgd2l0aCBRdDUgaW4gZGVidWcgbW9kZS4K KyAgICAgICAgd2hlbjogZmFsc2UKKyAgICAgICAgVGltZXIgeworICAgICAgICAgICAgcnVubmlu ZzogcGFyZW50LndpbmRvd1Nob3duCisgICAgICAgICAgICByZXBlYXQ6IGZhbHNlCisgICAgICAg ICAgICBpbnRlcnZhbDogMQorICAgICAgICAgICAgb25UcmlnZ2VyZWQ6IHBhcmVudC53aGVuID0g dHJ1ZQorICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gaW5pdCgpIHsKKyAgICAgICAgICAg IHdlYlZpZXcubGFzdFVybCA9ICIiCisgICAgICAgICAgICBzcHkuY2xlYXIoKQorICAgICAgICAg ICAgbG9hZFNweS5jbGVhcigpCisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiB0ZXN0X2Jh c2VVcmxBZnRlckxvYWRIdG1sKCkgeworICAgICAgICAgICAgbG9hZFNweS5jbGVhcigpCisgICAg ICAgICAgICBzcHkuY2xlYXIoKQorICAgICAgICAgICAgY29tcGFyZShzcHkuY291bnQsIDApCisg ICAgICAgICAgICB3ZWJWaWV3LmxvYWRIdG1sKCI8aHRtbD48aGVhZD48dGl0bGU+VGVzdCBwYWdl IHdpdGggaHVnZSBsaW5rIGFyZWE8L3RpdGxlPjwvaGVhZD48Ym9keT48YSB0aXRsZT1cIkEgdGl0 bGVcIiBocmVmPVwidGVzdDEuaHRtbFwiPjxpbWcgd2lkdGg9MjAwIGhlaWdodD0yMDA+PC9hPjwv Ym9keT48L2h0bWw+IiwgImh0dHA6Ly93d3cuZXhhbXBsZS5mb28uY29tIikKKyAgICAgICAgICAg IGxvYWRTcHkud2FpdCgpCisgICAgICAgICAgICBjb21wYXJlKCJodHRwOi8vd3d3LmV4YW1wbGUu Zm9vLmNvbS8iLCB3ZWJWaWV3LnVybCkKKyAgICAgICAgICAgIG1vdXNlTW92ZSh3ZWJWaWV3LCAx MDAsIDEwMCkKKyAgICAgICAgICAgIHNweS53YWl0KCkKKyAgICAgICAgICAgIGNvbXBhcmUoc3B5 LmNvdW50LCAxKQorICAgICAgICAgICAgY29tcGFyZSh3ZWJWaWV3Lmxhc3RVcmwsICJodHRwOi8v d3d3LmV4YW1wbGUuZm9vLmNvbS90ZXN0MS5odG1sIikKKyAgICAgICAgfQorICAgIH0KK30KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMv V2ViVmlldy90c3RfbG9hZEh0bWwucW1sIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF9sb2FkSHRtbC5xbWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYTRl NzgwNDgyODA0MGQ2NDVkOTgzN2YzZDkwMzk1NGY5ZmNlYzExMAotLS0gL2Rldi9udWxsCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmlldy90 c3RfbG9hZEh0bWwucW1sCkBAIC0wLDAgKzEsNDYgQEAKK2ltcG9ydCBRdFF1aWNrIDIuMAoraW1w b3J0IFF0VGVzdCAxLjAKK2ltcG9ydCBRdFdlYktpdCAzLjAKK2ltcG9ydCBRdFdlYktpdFRlc3Qg MS4wCisKK1dlYlZpZXcgeworICAgIGlkOiB3ZWJWaWV3CisgICAgd2lkdGg6IDIwMAorICAgIGhl aWdodDogNDAwCisKKyAgICBwcm9wZXJ0eSBzdHJpbmcgbGFzdFVybAorCisgICAgU2lnbmFsU3B5 IHsKKyAgICAgICAgaWQ6IGxvYWRTcHkKKyAgICAgICAgdGFyZ2V0OiB3ZWJWaWV3CisgICAgICAg IHNpZ25hbE5hbWU6ICJsb2FkU3VjY2VlZGVkIgorICAgIH0KKworICAgIFRlc3RDYXNlIHsKKyAg ICAgICAgbmFtZTogIldlYlZpZXdMb2FkSHRtbCIKKworICAgICAgICAvLyBEZWxheWVkIHdpbmRv d1Nob3duIHRvIHdvcmthcm91bmQgcHJvYmxlbXMgd2l0aCBRdDUgaW4gZGVidWcgbW9kZS4KKyAg ICAgICAgd2hlbjogZmFsc2UKKyAgICAgICAgVGltZXIgeworICAgICAgICAgICAgcnVubmluZzog cGFyZW50LndpbmRvd1Nob3duCisgICAgICAgICAgICByZXBlYXQ6IGZhbHNlCisgICAgICAgICAg ICBpbnRlcnZhbDogMQorICAgICAgICAgICAgb25UcmlnZ2VyZWQ6IHBhcmVudC53aGVuID0gdHJ1 ZQorICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gaW5pdCgpIHsKKyAgICAgICAgICAgIHdl YlZpZXcubGFzdFVybCA9ICIiCisgICAgICAgICAgICBsb2FkU3B5LmNsZWFyKCkKKyAgICAgICAg fQorCisgICAgICAgIGZ1bmN0aW9uIHRlc3RfbG9hZFByb2dyZXNzQWZ0ZXJMb2FkSHRtbCgpIHsK KyAgICAgICAgICAgIGxvYWRTcHkuY2xlYXIoKQorICAgICAgICAgICAgY29tcGFyZShsb2FkU3B5 LmNvdW50LCAwKQorICAgICAgICAgICAgY29tcGFyZSh3ZWJWaWV3LmxvYWRQcm9ncmVzcywgMCkK KyAgICAgICAgICAgIHdlYlZpZXcubG9hZEh0bWwoIjxodG1sPjxoZWFkPjx0aXRsZT5UZXN0IHBh Z2UgMTwvdGl0bGU+PC9oZWFkPjxib2R5PkhlbGxvLjwvYm9keT48L2h0bWw+IikKKyAgICAgICAg ICAgIGNvbXBhcmUod2ViVmlldy5sb2FkUHJvZ3Jlc3MsIDApCisgICAgICAgICAgICBsb2FkU3B5 LndhaXQoKQorICAgICAgICAgICAgY29tcGFyZSh3ZWJWaWV3LmxvYWRQcm9ncmVzcywgMTAwKQor ICAgICAgICB9CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9xbWx0ZXN0cy5wcm8gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3FtbHRlc3RzLnBybwppbmRleCAyNjlkYTc0Yzk4 MjcxMWE4Y2JmMDVmZDIyNjE3NDdhYjJkMDliYWNjLi45MWI0NGVjYTgwYTZiY2ZkMzYyMDliOTQ1 Nzg4MzNlZTUzZTNlOGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3Rlc3RzL3FtbHRlc3RzL3FtbHRlc3RzLnBybworKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3FtbHRlc3RzLnBybwpAQCAtMjEsNyArMjEsOSBA QCBPVEhFUl9GSUxFUyArPSBcCiAgICAgV2ViVmlldy90c3RfbG9hZFByb2dyZXNzU2lnbmFsLnFt bCBcCiAgICAgV2ViVmlldy90c3RfbG9hZFplcm9TaXplVmlldy5xbWwgXAogICAgIFdlYlZpZXcv dHN0X3ByZWZlcmVuY2VzLnFtbCBcCisgICAgV2ViVmlldy90c3RfbG9hZEh0bWwucW1sIFwKICAg ICBEZXNrdG9wQmVoYXZpb3IvdHN0X2xpbmtIb3ZlcmVkLnFtbCBcCiAgICAgRGVza3RvcEJlaGF2 aW9yL3RzdF9tZXNzYWdpbmcucW1sIFwKICAgICBEZXNrdG9wQmVoYXZpb3IvdHN0X2Rvd25sb2Fk LnFtbCBcCi0gICAgRGVza3RvcEJlaGF2aW9yL3RzdF9uYXZpZ2F0aW9uUG9saWN5Rm9yVXJsLnFt bAorICAgIERlc2t0b3BCZWhhdmlvci90c3RfbmF2aWdhdGlvblBvbGljeUZvclVybC5xbWwgXAor ICAgIERlc2t0b3BCZWhhdmlvci90c3RfbG9hZEh0bWwucW1sCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAppbmRleCAzNTY0ZGQ2YjZkODJiMDgxNTA3 NDZkOGQ2MjIxZGQ1MzUzNGIxMzQzLi5iYWRmMzYwMzRiYTRmNDk3YTUyNmY2M2IwNjVhNDZhMDg0 MGZjMzRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdl UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94 eS5jcHAKQEAgLTcxMyw2ICs3MTMsMTQgQEAgdm9pZCBRdFdlYlBhZ2VQcm94eTo6cG9zdE1lc3Nh Z2VUb05hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpCiAgICAgbV9jb250 ZXh0LT5wb3N0TWVzc2FnZVRvSW5qZWN0ZWRCdW5kbGUobWVzc2FnZU5hbWUsIGJvZHkuZ2V0KCkp OwogfQogCit2b2lkIFF0V2ViUGFnZVByb3h5Ojpsb2FkSFRNTFN0cmluZyhjb25zdCBRU3RyaW5n ICZodG1sLCBjb25zdCBRVXJsICZiYXNlVXJsKQoreworICAgIFdLUmV0YWluUHRyPFdLVVJMUmVm PiB3a1VybChXS1VSTENyZWF0ZVdpdGhRVXJsKGJhc2VVcmwpKTsKKyAgICBXS1JldGFpblB0cjxX S1N0cmluZ1JlZj4gd2tIdG1sU3RyaW5nKFdLU3RyaW5nQ3JlYXRlV2l0aFFTdHJpbmcoaHRtbCkp OworCisgICAgV0tQYWdlTG9hZEhUTUxTdHJpbmcocGFnZVJlZigpLCB3a0h0bWxTdHJpbmcuZ2V0 KCksIHdrVXJsLmdldCgpKTsKK30KKwogdm9pZCBRdFdlYlBhZ2VQcm94eTo6bG9hZChjb25zdCBR VXJsJiB1cmwpCiB7CiAgICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHdrdXJsKFdLVVJMQ3JlYXRl V2l0aFFVcmwodXJsKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRXZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQ cm94eS5oCmluZGV4IDY2ZGM0N2Q2MDkyN2UwOGI0MGE3M2M1NDhmNmYwYmU4YjRhZGZhNzYuLjEw M2RkYjBmNzc3Yzc1OGVjZWMwYzE3M2MxNTM3OTE2YjkzNTUxZmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCkBAIC0xNjEsNiArMTYxLDcgQEAgcHVi bGljOgogICAgIFdLUGFnZVJlZiBwYWdlUmVmKCkgY29uc3Q7CiAKICAgICB2b2lkIGxvYWQoY29u c3QgUVVybCYgdXJsKTsKKyAgICB2b2lkIGxvYWRIVE1MU3RyaW5nKGNvbnN0IFFTdHJpbmcgJmh0 bWwsIGNvbnN0IFFVcmwgJmJhc2VVcmwpOwogICAgIFFVcmwgdXJsKCkgY29uc3Q7CiAKICAgICB2 b2lkIHNldERyYXdpbmdBcmVhU2l6ZShjb25zdCBRU2l6ZSYpOwo= 115365 2011-11-16 06:11:42 -0800 2011-11-21 09:39:08 -0800 Patch bug-72161-20111116111127.patch text/plain 8597 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOWI0N2E4MDIzMDEzYWFh NmRmMmM5NDEwNTdjY2Q0ZGFjZWFjM2U3OC4uNjhkYmJjOGRhMzczZTZhNWJjNWUzODlmOGQ5MzVm NDhjOTViNDM0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTExLTExICBKZXN1 cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KKworICAg ICAgICBbUXRdW1dLMl0gSW1wbGVtZW50IGxvYWRIdG1sIEFQSSBmb3IgUVF1aWNrV2ViVmlldwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIxNjEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQg UVF1aWNrV2ViVmlldzo6bG9hZEh0bWwgdGhhdCBjYWxscyBRdFdlYlBhZ2VQcm94eTo6bG9hZEhU TUxTdHJpbmcuCisgICAgICAgIFRoaXMgZnVuY3Rpb24gd2lsbCB1c2UgV0tQYWdlTG9hZEhUTUxT dHJpbmcgaW4gb3JkZXIgdG8gbG9hZCBIVE1MIGZyb20gYSBnaXZlbiBzdHJpbmcuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNr V2ViVmlldzo6bG9hZEh0bWwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMvV2ViVmll dy90c3RfbG9hZEh0bWwucW1sOiBBZGRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rl c3RzL3FtbHRlc3RzL0Rlc2t0b3BCZWhhdmlvci90c3RfbG9hZEh0bWwucW1sOiBBZGRlZC4KKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3FtbHRlc3RzLnBybzoKKyAg ICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoUXRXZWJQ YWdlUHJveHk6OmxvYWRIVE1MU3RyaW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQ YWdlUHJveHkuaDoKKwogMjAxMS0xMS0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lh QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQWRkIHdlYmtpdF93ZWJfdmlld19sb2FkX3Jl cXVlc3QoKSB0byBXZWJLaXQyIEdUSysgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCA2ZDBhNmM2MmQ3MGU3MTVmZmIwMmY1 YjRiZTc3ZTM1ZmI1ZmZkYzRhLi42ZDU2MzU4OWUwMjY2MTFhNzlkZjZiMjc3YjVjYmJkN2IzYzBl MTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dl YnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5jcHAKQEAgLTQ5Myw1ICs0OTMsMjEgQEAgV0tQYWdlUmVmIFFRdWlja1dlYlZpZXc6OnBh Z2VSZWYoKSBjb25zdAogICAgIHJldHVybiBkLT5wYWdlUHJveHktPnBhZ2VSZWYoKTsKIH0KIAor LyohCisgICAgTG9hZHMgdGhlIHNwZWNpZmllZCBcYSBodG1sIGFzIHRoZSBjb250ZW50IG9mIHRo ZSB3ZWIgdmlldy4KKworICAgIEV4dGVybmFsIG9iamVjdHMgc3VjaCBhcyBzdHlsZXNoZWV0cyBv ciBpbWFnZXMgcmVmZXJlbmNlZCBpbiB0aGUgSFRNTAorICAgIGRvY3VtZW50IGFyZSBsb2NhdGVk IHJlbGF0aXZlIHRvIFxhIGJhc2VVcmwuCisKKyAgICBUaGUgXGEgaHRtbCBpcyBsb2FkZWQgaW1t ZWRpYXRlbHk7IGV4dGVybmFsIG9iamVjdHMgYXJlIGxvYWRlZCBhc3luY2hyb25vdXNseS4KKwor ICAgIFxzYSBsb2FkKCkKKyovCit2b2lkIFFRdWlja1dlYlZpZXc6OmxvYWRIdG1sKGNvbnN0IFFT dHJpbmcmIGh0bWwsIGNvbnN0IFFVcmwmIGJhc2VVcmwpCit7CisgICAgUV9EKFFRdWlja1dlYlZp ZXcpOworICAgIGQtPnBhZ2VQcm94eS0+bG9hZEhUTUxTdHJpbmcoaHRtbCwgYmFzZVVybCk7Cit9 CisKICNpbmNsdWRlICJtb2NfcXF1aWNrd2Vidmlldy5jcHAiCiAjaW5jbHVkZSAibW9jX3FxdWlj a3dlYnZpZXdfcC5jcHAiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnZpZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2Vidmlldy5oCmluZGV4IGY4YmE4MTdhMWYzNzUxOTQzNTQ5YTNjZTAwOGYxMjg1Njg5MzYw NzMuLmMxNDk0Y2I2NDg3M2RhN2ZkZDM1NmQ2OTY5ZGZlNTc2NGM4Mzc0MTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5oCkBAIC05Niw2ICs5 Niw4IEBAIHB1YmxpYyBRX1NMT1RTOgogICAgIHZvaWQgc3RvcCgpOwogICAgIHZvaWQgcmVsb2Fk KCk7CiAKKyAgICB2b2lkIGxvYWRIdG1sKGNvbnN0IFFTdHJpbmcmIGh0bWwsIGNvbnN0IFFVcmwm IGJhc2VVcmwgPSBRVXJsKCkpOworCiBRX1NJR05BTFM6CiAgICAgdm9pZCB0aXRsZUNoYW5nZWQo Y29uc3QgUVN0cmluZyYgdGl0bGUpOwogICAgIHZvaWQgc3RhdHVzQmFyTWVzc2FnZUNoYW5nZWQo Y29uc3QgUVN0cmluZyYgbWVzc2FnZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL0Rlc2t0b3BCZWhhdmlvci90c3RfbG9hZEh0bWwu cW1sIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNr dG9wQmVoYXZpb3IvdHN0X2xvYWRIdG1sLnFtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mYzAwMDQ2M2QwM2NhZDBm MjFlNjA2YzgxYWQzNzIyZTY5NGQ2ODE4Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9EZXNrdG9wQmVoYXZpb3IvdHN0X2xv YWRIdG1sLnFtbApAQCAtMCwwICsxLDYwIEBACitpbXBvcnQgUXRRdWljayAyLjAKK2ltcG9ydCBR dFRlc3QgMS4wCitpbXBvcnQgUXRXZWJLaXQgMy4wCitpbXBvcnQgUXRXZWJLaXRUZXN0IDEuMAor CitEZXNrdG9wV2ViVmlldyB7CisgICAgaWQ6IHdlYlZpZXcKKyAgICB3aWR0aDogMjAwCisgICAg aGVpZ2h0OiA0MDAKKworICAgIHByb3BlcnR5IHN0cmluZyBsYXN0VXJsCisKKyAgICBTaWduYWxT cHkgeworICAgICAgICBpZDogbG9hZFNweQorICAgICAgICB0YXJnZXQ6IHdlYlZpZXcKKyAgICAg ICAgc2lnbmFsTmFtZTogImxvYWRTdWNjZWVkZWQiCisgICAgfQorCisgICAgU2lnbmFsU3B5IHsK KyAgICAgICAgaWQ6IGxpbmtIb3ZlcmVkU3B5CisgICAgICAgIHRhcmdldDogd2ViVmlldworICAg ICAgICBzaWduYWxOYW1lOiAibGlua0hvdmVyZWQiCisgICAgfQorCisgICAgb25MaW5rSG92ZXJl ZDogeworICAgICAgICB3ZWJWaWV3Lmxhc3RVcmwgPSB1cmwKKyAgICB9CisKKyAgICBUZXN0Q2Fz ZSB7CisgICAgICAgIG5hbWU6ICJEZXNrdG9wV2ViVmlld0xvYWRIdG1sIgorCisgICAgICAgIC8v IERlbGF5ZWQgd2luZG93U2hvd24gdG8gd29ya2Fyb3VuZCBwcm9ibGVtcyB3aXRoIFF0NSBpbiBk ZWJ1ZyBtb2RlLgorICAgICAgICB3aGVuOiBmYWxzZQorICAgICAgICBUaW1lciB7CisgICAgICAg ICAgICBydW5uaW5nOiBwYXJlbnQud2luZG93U2hvd24KKyAgICAgICAgICAgIHJlcGVhdDogZmFs c2UKKyAgICAgICAgICAgIGludGVydmFsOiAxCisgICAgICAgICAgICBvblRyaWdnZXJlZDogcGFy ZW50LndoZW4gPSB0cnVlCisgICAgICAgIH0KKworICAgICAgICBmdW5jdGlvbiBpbml0KCkgewor ICAgICAgICAgICAgd2ViVmlldy5sYXN0VXJsID0gIiIKKyAgICAgICAgICAgIGxpbmtIb3ZlcmVk U3B5LmNsZWFyKCkKKyAgICAgICAgICAgIGxvYWRTcHkuY2xlYXIoKQorICAgICAgICB9CisKKyAg ICAgICAgZnVuY3Rpb24gdGVzdF9iYXNlVXJsQWZ0ZXJMb2FkSHRtbCgpIHsKKyAgICAgICAgICAg IGxvYWRTcHkuY2xlYXIoKQorICAgICAgICAgICAgbGlua0hvdmVyZWRTcHkuY2xlYXIoKQorICAg ICAgICAgICAgY29tcGFyZShsaW5rSG92ZXJlZFNweS5jb3VudCwgMCkKKyAgICAgICAgICAgIHdl YlZpZXcubG9hZEh0bWwoIjxodG1sPjxoZWFkPjx0aXRsZT5UZXN0IHBhZ2Ugd2l0aCBodWdlIGxp bmsgYXJlYTwvdGl0bGU+PC9oZWFkPjxib2R5PjxhIHRpdGxlPVwiQSB0aXRsZVwiIGhyZWY9XCJ0 ZXN0MS5odG1sXCI+PGltZyB3aWR0aD0yMDAgaGVpZ2h0PTIwMD48L2E+PC9ib2R5PjwvaHRtbD4i LCAiaHR0cDovL3d3dy5leGFtcGxlLmZvby5jb20iKQorICAgICAgICAgICAgbG9hZFNweS53YWl0 KCkKKyAgICAgICAgICAgIGNvbXBhcmUoImh0dHA6Ly93d3cuZXhhbXBsZS5mb28uY29tLyIsIHdl YlZpZXcudXJsKQorICAgICAgICAgICAgbW91c2VNb3ZlKHdlYlZpZXcsIDEwMCwgMTAwKQorICAg ICAgICAgICAgbGlua0hvdmVyZWRTcHkud2FpdCgpCisgICAgICAgICAgICBjb21wYXJlKGxpbmtI b3ZlcmVkU3B5LmNvdW50LCAxKQorICAgICAgICAgICAgY29tcGFyZSh3ZWJWaWV3Lmxhc3RVcmws ICJodHRwOi8vd3d3LmV4YW1wbGUuZm9vLmNvbS90ZXN0MS5odG1sIikKKyAgICAgICAgfQorICAg IH0KK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMv cW1sdGVzdHMvV2ViVmlldy90c3RfbG9hZEh0bWwucW1sIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9XZWJWaWV3L3RzdF9sb2FkSHRtbC5xbWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYTRlNzgwNDgyODA0MGQ2NDVkOTgzN2YzZDkwMzk1NGY5ZmNlYzExMAotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvdGVzdHMvcW1sdGVzdHMv V2ViVmlldy90c3RfbG9hZEh0bWwucW1sCkBAIC0wLDAgKzEsNDYgQEAKK2ltcG9ydCBRdFF1aWNr IDIuMAoraW1wb3J0IFF0VGVzdCAxLjAKK2ltcG9ydCBRdFdlYktpdCAzLjAKK2ltcG9ydCBRdFdl YktpdFRlc3QgMS4wCisKK1dlYlZpZXcgeworICAgIGlkOiB3ZWJWaWV3CisgICAgd2lkdGg6IDIw MAorICAgIGhlaWdodDogNDAwCisKKyAgICBwcm9wZXJ0eSBzdHJpbmcgbGFzdFVybAorCisgICAg U2lnbmFsU3B5IHsKKyAgICAgICAgaWQ6IGxvYWRTcHkKKyAgICAgICAgdGFyZ2V0OiB3ZWJWaWV3 CisgICAgICAgIHNpZ25hbE5hbWU6ICJsb2FkU3VjY2VlZGVkIgorICAgIH0KKworICAgIFRlc3RD YXNlIHsKKyAgICAgICAgbmFtZTogIldlYlZpZXdMb2FkSHRtbCIKKworICAgICAgICAvLyBEZWxh eWVkIHdpbmRvd1Nob3duIHRvIHdvcmthcm91bmQgcHJvYmxlbXMgd2l0aCBRdDUgaW4gZGVidWcg bW9kZS4KKyAgICAgICAgd2hlbjogZmFsc2UKKyAgICAgICAgVGltZXIgeworICAgICAgICAgICAg cnVubmluZzogcGFyZW50LndpbmRvd1Nob3duCisgICAgICAgICAgICByZXBlYXQ6IGZhbHNlCisg ICAgICAgICAgICBpbnRlcnZhbDogMQorICAgICAgICAgICAgb25UcmlnZ2VyZWQ6IHBhcmVudC53 aGVuID0gdHJ1ZQorICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gaW5pdCgpIHsKKyAgICAg ICAgICAgIHdlYlZpZXcubGFzdFVybCA9ICIiCisgICAgICAgICAgICBsb2FkU3B5LmNsZWFyKCkK KyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHRlc3RfbG9hZFByb2dyZXNzQWZ0ZXJMb2Fk SHRtbCgpIHsKKyAgICAgICAgICAgIGxvYWRTcHkuY2xlYXIoKQorICAgICAgICAgICAgY29tcGFy ZShsb2FkU3B5LmNvdW50LCAwKQorICAgICAgICAgICAgY29tcGFyZSh3ZWJWaWV3LmxvYWRQcm9n cmVzcywgMCkKKyAgICAgICAgICAgIHdlYlZpZXcubG9hZEh0bWwoIjxodG1sPjxoZWFkPjx0aXRs ZT5UZXN0IHBhZ2UgMTwvdGl0bGU+PC9oZWFkPjxib2R5PkhlbGxvLjwvYm9keT48L2h0bWw+IikK KyAgICAgICAgICAgIGNvbXBhcmUod2ViVmlldy5sb2FkUHJvZ3Jlc3MsIDApCisgICAgICAgICAg ICBsb2FkU3B5LndhaXQoKQorICAgICAgICAgICAgY29tcGFyZSh3ZWJWaWV3LmxvYWRQcm9ncmVz cywgMTAwKQorICAgICAgICB9CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC90ZXN0cy9xbWx0ZXN0cy9xbWx0ZXN0cy5wcm8gYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3FtbHRlc3RzLnBybwppbmRleCAy NjlkYTc0Yzk4MjcxMWE4Y2JmMDVmZDIyNjE3NDdhYjJkMDliYWNjLi45MWI0NGVjYTgwYTZiY2Zk MzYyMDliOTQ1Nzg4MzNlZTUzZTNlOGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3FtbHRlc3RzLnBybworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Rlc3RzL3FtbHRlc3RzL3FtbHRlc3RzLnBybwpAQCAtMjEs NyArMjEsOSBAQCBPVEhFUl9GSUxFUyArPSBcCiAgICAgV2ViVmlldy90c3RfbG9hZFByb2dyZXNz U2lnbmFsLnFtbCBcCiAgICAgV2ViVmlldy90c3RfbG9hZFplcm9TaXplVmlldy5xbWwgXAogICAg IFdlYlZpZXcvdHN0X3ByZWZlcmVuY2VzLnFtbCBcCisgICAgV2ViVmlldy90c3RfbG9hZEh0bWwu cW1sIFwKICAgICBEZXNrdG9wQmVoYXZpb3IvdHN0X2xpbmtIb3ZlcmVkLnFtbCBcCiAgICAgRGVz a3RvcEJlaGF2aW9yL3RzdF9tZXNzYWdpbmcucW1sIFwKICAgICBEZXNrdG9wQmVoYXZpb3IvdHN0 X2Rvd25sb2FkLnFtbCBcCi0gICAgRGVza3RvcEJlaGF2aW9yL3RzdF9uYXZpZ2F0aW9uUG9saWN5 Rm9yVXJsLnFtbAorICAgIERlc2t0b3BCZWhhdmlvci90c3RfbmF2aWdhdGlvblBvbGljeUZvclVy bC5xbWwgXAorICAgIERlc2t0b3BCZWhhdmlvci90c3RfbG9hZEh0bWwucW1sCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAppbmRleCAzNTY0ZGQ2YjZk ODJiMDgxNTA3NDZkOGQ2MjIxZGQ1MzUzNGIxMzQzLi4yMjIxNzNjZDA1YWM2OTNlYjM5ZDc0NWVi YmJjOWRkMzNjYWU5OWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRXZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdl YlBhZ2VQcm94eS5jcHAKQEAgLTcxMyw2ICs3MTMsMTQgQEAgdm9pZCBRdFdlYlBhZ2VQcm94eTo6 cG9zdE1lc3NhZ2VUb05hdmlnYXRvclF0T2JqZWN0KGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpCiAg ICAgbV9jb250ZXh0LT5wb3N0TWVzc2FnZVRvSW5qZWN0ZWRCdW5kbGUobWVzc2FnZU5hbWUsIGJv ZHkuZ2V0KCkpOwogfQogCit2b2lkIFF0V2ViUGFnZVByb3h5Ojpsb2FkSFRNTFN0cmluZyhjb25z dCBRU3RyaW5nJiBodG1sLCBjb25zdCBRVXJsJiBiYXNlVXJsKQoreworICAgIFdLUmV0YWluUHRy PFdLVVJMUmVmPiB3a1VybChXS1VSTENyZWF0ZVdpdGhRVXJsKGJhc2VVcmwpKTsKKyAgICBXS1Jl dGFpblB0cjxXS1N0cmluZ1JlZj4gd2tIdG1sU3RyaW5nKFdLU3RyaW5nQ3JlYXRlV2l0aFFTdHJp bmcoaHRtbCkpOworCisgICAgV0tQYWdlTG9hZEhUTUxTdHJpbmcocGFnZVJlZigpLCB3a0h0bWxT dHJpbmcuZ2V0KCksIHdrVXJsLmdldCgpKTsKK30KKwogdm9pZCBRdFdlYlBhZ2VQcm94eTo6bG9h ZChjb25zdCBRVXJsJiB1cmwpCiB7CiAgICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHdrdXJsKFdL VVJMQ3JlYXRlV2l0aFFVcmwodXJsKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFdlYlBhZ2VQcm94eS5oCmluZGV4IDY2ZGM0N2Q2MDkyN2UwOGI0MGE3M2M1NDhmNmYwYmU4YjRh ZGZhNzYuLjMwNDQxZWQ5N2U3MzU3Mjk2MjdiYzBmMmRhNTdlOTg5NDE0NjljNjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5oCkBAIC0xNjEsNiArMTYx LDcgQEAgcHVibGljOgogICAgIFdLUGFnZVJlZiBwYWdlUmVmKCkgY29uc3Q7CiAKICAgICB2b2lk IGxvYWQoY29uc3QgUVVybCYgdXJsKTsKKyAgICB2b2lkIGxvYWRIVE1MU3RyaW5nKGNvbnN0IFFT dHJpbmcmIGh0bWwsIGNvbnN0IFFVcmwmIGJhc2VVcmwpOwogICAgIFFVcmwgdXJsKCkgY29uc3Q7 CiAKICAgICB2b2lkIHNldERyYXdpbmdBcmVhU2l6ZShjb25zdCBRU2l6ZSYpOwo=