89777 2012-06-22 11:57:59 -0700 [BlackBerry] Use air controls if client doesn't support HTML control 2012-06-25 08:28:13 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 haizhang webkit-unassigned tonikitoo webkit.review.bot oldest_to_newest 655677 0 haizhang 2012-06-22 11:57:59 -0700 Currently HTML controls depend on client implementing CreateWindow event, for those clients that don't implement CreateWindow event, use old air controls so we don't break them. 655742 1 149095 haizhang 2012-06-22 13:46:52 -0700 Created attachment 149095 patch 655765 2 149095 yong.li.webkit 2012-06-22 14:26:06 -0700 Comment on attachment 149095 patch View in context: https://bugs.webkit.org/attachment.cgi?id=149095&action=review > Source/WebKit/blackberry/Api/WebPageClient.h:163 > + virtual void openPopupList(bool multiple, int size, const ScopeArray<WebString>& labels, bool* enableds, const int* itemType, bool* selecteds) = 0; "size" is a little bit vague here. Are "enableds" and "selecteds" outputs? > Source/WebKit/blackberry/Api/WebPageClient.h:255 > - virtual void createPopupWebView(const Platform::IntRect& webViewRect) = 0; > + virtual bool createPopupWebView(Platform::IntRect) = 0; why remove const&? > Source/WebKit/blackberry/ChangeLog:4 > + [BlackBerry] Use air controls if client doesn't support HTML control > + https://bugs.webkit.org/show_bug.cgi?id=89777 air=>AIR? 655770 3 149095 haizhang 2012-06-22 14:30:20 -0700 Comment on attachment 149095 patch View in context: https://bugs.webkit.org/attachment.cgi?id=149095&action=review >> Source/WebKit/blackberry/Api/WebPageClient.h:163 >> + virtual void openPopupList(bool multiple, int size, const ScopeArray<WebString>& labels, bool* enableds, const int* itemType, bool* selecteds) = 0; > > "size" is a little bit vague here. Are "enableds" and "selecteds" outputs? no, they are inputs. Actually I just put the old method back, I thought we don't need it any more so removed in previous patch. >> Source/WebKit/blackberry/Api/WebPageClient.h:255 >> + virtual bool createPopupWebView(Platform::IntRect) = 0; > > why remove const&? In our repo it's just Platform::IntRect, also in libwebview it's the same too. Just want to make it consistent, otherwise we need to change libwebview too. >> Source/WebKit/blackberry/ChangeLog:4 >> + https://bugs.webkit.org/show_bug.cgi?id=89777 > > air=>AIR? yeah. 655798 4 149110 haizhang 2012-06-22 14:48:57 -0700 Created attachment 149110 updated patch 656554 5 149110 mifenton 2012-06-25 07:40:21 -0700 Comment on attachment 149110 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=149110&action=review > Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:1178 > + if (m_webPage->m_page->chrome()->client()->openPagePopup(selectClient, elementRectInRootView)) Why not make this if (!..) And then only have one return true? 656560 6 149292 haizhang 2012-06-25 07:54:00 -0700 Created attachment 149292 updated patch 656580 7 149292 webkit.review.bot 2012-06-25 08:28:08 -0700 Comment on attachment 149292 updated patch Clearing flags on attachment: 149292 Committed r121158: <http://trac.webkit.org/changeset/121158> 656581 8 webkit.review.bot 2012-06-25 08:28:13 -0700 All reviewed patches have been landed. Closing bug. 149095 2012-06-22 13:46:52 -0700 2012-06-22 14:48:57 -0700 patch 0001-2012-06-22-Crystal-Zhang-haizhang-rim.com.patch text/plain 7149 haizhang RnJvbSAxNGVkMGVmMTg5N2FmMTIwNzgwNTQxMTA5N2I1NjM2Y2MyNWY0YTRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBGcmksIDIyIEp1biAyMDEyIDE2OjQxOjU2IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMi0w Ni0yMiAgQ3J5c3RhbCBaaGFuZyAgPGhhaXpoYW5nQHJpbS5jb20+CgogICAgICAgIFtCbGFja0Jl cnJ5XSBVc2UgYWlyIGNvbnRyb2xzIGlmIGNsaWVudCBkb2Vzbid0IHN1cHBvcnQgSFRNTCBjb250 cm9sCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5Nzc3 CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBDdXJyZW50bHkg SFRNTCBjb250cm9scyBkZXBlbmQgb24gY2xpZW50IGltcGxlbWVudGluZyBDcmVhdGVXaW5kb3cg ZXZlbnQsIGZvciB0aG9zZSBjbGllbnRzCiAgICAgICAgdGhhdCBkb24ndCBpbXBsZW1lbnQgQ3Jl YXRlV2luZG93IGV2ZW50LCB1c2Ugb2xkIGFpciBjb250cm9scyBzbyB3ZSBkb24ndCBicmVhayB0 aGVtLgoKICAgICAgICBQUiAxNjM4MTguCgogICAgICAgICogQXBpL1dlYlBhZ2VDbGllbnQuaDoK ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwOgogICAg ICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpvcGVuUGFnZVBvcHVwKToKICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwOgogICAgICAgIChX ZWJDb3JlOjpQYWdlUG9wdXBCbGFja0JlcnJ5OjpzZW5kQ3JlYXRlUG9wdXBXZWJWaWV3UmVxdWVz dCk6CiAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5Lmg6CiAgICAg ICAgKFBhZ2VQb3B1cEJsYWNrQmVycnkpOgogICAgICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuY3BwOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6b3Bl blNlbGVjdFBvcHVwKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VD bGllbnQuaCAgICAgICB8ICAgIDMgKystCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICB8ICAgMjIgKysrKysrKysrKysrKysrKysrKysKIC4uLi9XZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcCAgICAgIHwgICAgNyArKysrKy0t CiAuLi4vV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHAgICAgICAgICB8ICAg IDQgKystLQogLi4uL1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuaCAgICAgICAg ICAgfCAgICAyICstCiAuLi4vYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5j cHAgICAgICB8ICAgIDcgKysrKystLQogNiBmaWxlcyBjaGFuZ2VkLCAzNyBpbnNlcnRpb25zKCsp LCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl Q2xpZW50LmgKaW5kZXggMTMyZTZkMC4uNTdhNzI4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKQEAgLTE2MCw2ICsxNjAsNyBAQCBwdWJsaWM6CiAK ICAgICB2aXJ0dWFsIHZvaWQgcmVzZXRCYWNrRm9yd2FyZExpc3QodW5zaWduZWQgbGlzdFNpemUs IHVuc2lnbmVkIGN1cnJlbnRJbmRleCkgPSAwOwogCisgICAgdmlydHVhbCB2b2lkIG9wZW5Qb3B1 cExpc3QoYm9vbCBtdWx0aXBsZSwgaW50IHNpemUsIGNvbnN0IFNjb3BlQXJyYXk8V2ViU3RyaW5n PiYgbGFiZWxzLCBib29sKiBlbmFibGVkcywgY29uc3QgaW50KiBpdGVtVHlwZSwgYm9vbCogc2Vs ZWN0ZWRzKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIG9wZW5EYXRlVGltZVBvcHVwKGludCB0eXBl LCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlLCBjb25zdCBXZWJTdHJpbmcmIG1pbiwgY29uc3QgV2Vi U3RyaW5nJiBtYXgsIGRvdWJsZSBzdGVwKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIG9wZW5Db2xv clBvcHVwKGNvbnN0IFdlYlN0cmluZyYgdmFsdWUpID0gMDsKIApAQCAtMjUxLDcgKzI1Miw3IEBA IHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJDYWNoZSgpID0gMDsKIAogICAgIHZpcnR1 YWwgYm9vbCBoYXNLZXlib2FyZEZvY3VzKCkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBjcmVhdGVQ b3B1cFdlYlZpZXcoY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHdlYlZpZXdSZWN0KSA9IDA7Cisg ICAgdmlydHVhbCBib29sIGNyZWF0ZVBvcHVwV2ViVmlldyhQbGF0Zm9ybTo6SW50UmVjdCkgPSAw OwogICAgIHZpcnR1YWwgdm9pZCBjbG9zZVBvcHVwV2ViVmlldygpID0gMDsKIH07CiB9IC8vIG5h bWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IDQzODhiYjMu LmZhMGU4OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBA CisyMDEyLTA2LTIyICBDcnlzdGFsIFpoYW5nICA8aGFpemhhbmdAcmltLmNvbT4KKworICAgICAg ICBbQmxhY2tCZXJyeV0gVXNlIGFpciBjb250cm9scyBpZiBjbGllbnQgZG9lc24ndCBzdXBwb3J0 IEhUTUwgY29udHJvbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODk3NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBDdXJyZW50bHkgSFRNTCBjb250cm9scyBkZXBlbmQgb24gY2xpZW50IGltcGxlbWVudGlu ZyBDcmVhdGVXaW5kb3cgZXZlbnQsIGZvciB0aG9zZSBjbGllbnRzCisgICAgICAgIHRoYXQgZG9u J3QgaW1wbGVtZW50IENyZWF0ZVdpbmRvdyBldmVudCwgdXNlIG9sZCBhaXIgY29udHJvbHMgc28g d2UgZG9uJ3QgYnJlYWsgdGhlbS4KKworICAgICAgICBQUiAxNjM4MTguCisKKyAgICAgICAgKiBB cGkvV2ViUGFnZUNsaWVudC5oOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tCZXJy eTo6b3BlblBhZ2VQb3B1cCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxh Y2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlUG9wdXBCbGFja0JlcnJ5OjpzZW5k Q3JlYXRlUG9wdXBXZWJWaWV3UmVxdWVzdCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvUGFn ZVBvcHVwQmxhY2tCZXJyeS5oOgorICAgICAgICAoUGFnZVBvcHVwQmxhY2tCZXJyeSk6CisgICAg ICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6Om9wZW5TZWxlY3RQb3B1cCk6CisKIDIwMTItMDYtMjIg IEFuZHJldyBMbyAgPGFubG9AcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gVGFwIGhp Z2hsaWdodCBmYWRlIGFuaW1hdGlvbnMgYXJlIGFkZGVkIHRvIG92ZXJsYXkgY29udGludW91c2x5 IGR1cmluZyBwaW5jaCB6b29tLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwCmlu ZGV4IDU4NjJhMjAuLjRkMjAyNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5j cHAKQEAgLTMwNyw4ICszMDcsMTEgQEAgUGFnZVBvcHVwKiBDaHJvbWVDbGllbnRCbGFja0JlcnJ5 OjpvcGVuUGFnZVBvcHVwKFBhZ2VQb3B1cENsaWVudCogY2xpZW50LCBjb25zdAogCiAgICAgUGFn ZVBvcHVwQmxhY2tCZXJyeSogd2ViUG9wdXAgPSBuZXcgUGFnZVBvcHVwQmxhY2tCZXJyeShtX3dl YlBhZ2VQcml2YXRlLCBjbGllbnQsIHJvb3RWaWV3VG9TY3JlZW4ob3JpZ2luQm91bmRzSW5Sb290 VmlldykpOwogICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fd2ViUGFnZS0+cG9wdXBPcGVuZWQod2Vi UG9wdXApOwotICAgIHdlYlBvcHVwLT5zZW5kQ3JlYXRlUG9wdXBXZWJWaWV3UmVxdWVzdCgpOwot ICAgIHJldHVybiB3ZWJQb3B1cDsKKyAgICBpZiAod2ViUG9wdXAtPnNlbmRDcmVhdGVQb3B1cFdl YlZpZXdSZXF1ZXN0KCkpCisgICAgICAgIHJldHVybiB3ZWJQb3B1cDsKKworICAgIGNsb3NlUGFn ZVBvcHVwKDApOworICAgIHJldHVybiAwOwogfQogCiB2b2lkIENocm9tZUNsaWVudEJsYWNrQmVy cnk6OmNsb3NlUGFnZVBvcHVwKFBhZ2VQb3B1cCopCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5j cHAKaW5kZXggMDFmN2JjOC4uYTc1MWZiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmNw cApAQCAtNTYsOSArNTYsOSBAQCBQYWdlUG9wdXBCbGFja0JlcnJ5Ojp+UGFnZVBvcHVwQmxhY2tC ZXJyeSgpCiB7CiB9CiAKLXZvaWQgUGFnZVBvcHVwQmxhY2tCZXJyeTo6c2VuZENyZWF0ZVBvcHVw V2ViVmlld1JlcXVlc3QoKQorYm9vbCBQYWdlUG9wdXBCbGFja0JlcnJ5OjpzZW5kQ3JlYXRlUG9w dXBXZWJWaWV3UmVxdWVzdCgpCiB7Ci0gICAgbV93ZWJQYWdlUHJpdmF0ZS0+Y2xpZW50KCktPmNy ZWF0ZVBvcHVwV2ViVmlldyhtX3JlY3QpOworICAgIHJldHVybiBtX3dlYlBhZ2VQcml2YXRlLT5j bGllbnQoKS0+Y3JlYXRlUG9wdXBXZWJWaWV3KG1fcmVjdCk7CiB9CiAKIGJvb2wgUGFnZVBvcHVw QmxhY2tCZXJyeTo6aW5pdChXZWJQYWdlKiB3ZWJwYWdlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuaCBiL1Nv dXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5 LmgKaW5kZXggNDc3NGYxZS4uYzgyZThjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5oCkBA IC00MSw3ICs0MSw3IEBAIHB1YmxpYzoKICAgICBQYWdlUG9wdXBCbGFja0JlcnJ5KEJsYWNrQmVy cnk6OldlYktpdDo6V2ViUGFnZVByaXZhdGUqLCBQYWdlUG9wdXBDbGllbnQqLCBjb25zdCBJbnRS ZWN0Jik7CiAgICAgflBhZ2VQb3B1cEJsYWNrQmVycnkoKTsKIAotICAgIHZvaWQgc2VuZENyZWF0 ZVBvcHVwV2ViVmlld1JlcXVlc3QoKTsKKyAgICBib29sIHNlbmRDcmVhdGVQb3B1cFdlYlZpZXdS ZXF1ZXN0KCk7CiAgICAgYm9vbCBpbml0KEJsYWNrQmVycnk6OldlYktpdDo6V2ViUGFnZSopOwog ICAgIHZvaWQgY2xvc2VQb3B1cCgpOwogICAgIHZvaWQgaW5zdGFsbERvbUZ1bmN0aW9uKEZyYW1l Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9J bnB1dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv SW5wdXRIYW5kbGVyLmNwcAppbmRleCBlYTY3NDFkLi5iMGY1OTg1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAK QEAgLTExNzQsOCArMTE3NCwxMSBAQCBib29sIElucHV0SGFuZGxlcjo6b3BlblNlbGVjdFBvcHVw KEhUTUxTZWxlY3RFbGVtZW50KiBzZWxlY3QpCiAgICAgfQogCiAgICAgU2VsZWN0UG9wdXBDbGll bnQqIHNlbGVjdENsaWVudCA9IG5ldyBTZWxlY3RQb3B1cENsaWVudChtdWx0aXBsZSwgc2l6ZSwg bGFiZWxzLCBlbmFibGVkcywgaXRlbVR5cGVzLCBzZWxlY3RlZHMsIG1fd2ViUGFnZSwgc2VsZWN0 KTsKLSAgICBXZWJDb3JlOjpJbnRSZWN0IGVsZW1lbnRSZWN0SW5Sb290VmlldyA9IHNlbGVjdC0+ ZG9jdW1lbnQoKS0+dmlldygpLT5jb250ZW50c1RvUm9vdFZpZXcoc2VsZWN0LT5nZXRSZWN0KCkp OwotICAgIG1fd2ViUGFnZS0+bV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPm9wZW5QYWdlUG9w dXAoc2VsZWN0Q2xpZW50LCBlbGVtZW50UmVjdEluUm9vdFZpZXcpOworICAgIFdlYkNvcmU6Oklu dFJlY3QgZWxlbWVudFJlY3RJblJvb3RWaWV3ID0gc2VsZWN0LT5kb2N1bWVudCgpLT52aWV3KCkt PmNvbnRlbnRzVG9Sb290VmlldyhlbmNsb3NpbmdJbnRSZWN0KHNlbGVjdC0+Z2V0UmVjdCgpKSk7 CisgICAgaWYgKG1fd2ViUGFnZS0+bV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPm9wZW5QYWdl UG9wdXAoc2VsZWN0Q2xpZW50LCBlbGVtZW50UmVjdEluUm9vdFZpZXcpKQorICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICAvLyBGYWlsIHRvIGNyZWF0ZSBIVE1MIHBvcHVwLCB1c2UgdGhlIG9sZCBw YXRoCisgICAgbV93ZWJQYWdlLT5tX2NsaWVudC0+b3BlblBvcHVwTGlzdChtdWx0aXBsZSwgc2l6 ZSwgbGFiZWxzLCBlbmFibGVkcywgaXRlbVR5cGVzLCBzZWxlY3RlZHMpOwogICAgIHJldHVybiB0 cnVlOwogfQogCi0tIAoxLjcuMTAuMQoK 149110 2012-06-22 14:48:57 -0700 2012-06-25 07:54:00 -0700 updated patch 0001-2012-06-22-Crystal-Zhang-haizhang-rim.com.patch text/plain 7168 haizhang RnJvbSA5MWE4ZjJmNTM4NGEzYzI3NTUxNGFhMjhmODg5NDc2ZDY5MjcxMTk4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBGcmksIDIyIEp1biAyMDEyIDE2OjQxOjU2IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMi0w Ni0yMiAgQ3J5c3RhbCBaaGFuZyAgPGhhaXpoYW5nQHJpbS5jb20+CgogICAgICAgIFtCbGFja0Jl cnJ5XSBVc2UgYWlyIGNvbnRyb2xzIGlmIGNsaWVudCBkb2Vzbid0IHN1cHBvcnQgSFRNTCBjb250 cm9sCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5Nzc3 CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBDdXJyZW50bHkg SFRNTCBjb250cm9scyBkZXBlbmQgb24gY2xpZW50IGltcGxlbWVudGluZyBDcmVhdGVXaW5kb3cg ZXZlbnQsIGZvciB0aG9zZSBjbGllbnRzCiAgICAgICAgdGhhdCBkb24ndCBpbXBsZW1lbnQgQ3Jl YXRlV2luZG93IGV2ZW50LCB1c2Ugb2xkIGFpciBjb250cm9scyBzbyB3ZSBkb24ndCBicmVhayB0 aGVtLgoKICAgICAgICBQUiAxNjM4MTguCgogICAgICAgICogQXBpL1dlYlBhZ2VDbGllbnQuaDoK ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwOgogICAg ICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpvcGVuUGFnZVBvcHVwKToKICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwOgogICAgICAgIChX ZWJDb3JlOjpQYWdlUG9wdXBCbGFja0JlcnJ5OjpzZW5kQ3JlYXRlUG9wdXBXZWJWaWV3UmVxdWVz dCk6CiAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5Lmg6CiAgICAg ICAgKFBhZ2VQb3B1cEJsYWNrQmVycnkpOgogICAgICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuY3BwOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6b3Bl blNlbGVjdFBvcHVwKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VD bGllbnQuaCAgICAgICB8ICAgIDMgKystCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICB8ICAgMjIgKysrKysrKysrKysrKysrKysrKysKIC4uLi9XZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcCAgICAgIHwgICAgNyArKysrKy0t CiAuLi4vV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5jcHAgICAgICAgICB8ICAg IDQgKystLQogLi4uL1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuaCAgICAgICAg ICAgfCAgICAyICstCiAuLi4vYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5j cHAgICAgICB8ICAgIDcgKysrKystLQogNiBmaWxlcyBjaGFuZ2VkLCAzNyBpbnNlcnRpb25zKCsp LCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9B cGkvV2ViUGFnZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdl Q2xpZW50LmgKaW5kZXggMTMyZTZkMC4uN2NhMmZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKQEAgLTE2MCw2ICsxNjAsNyBAQCBwdWJsaWM6CiAK ICAgICB2aXJ0dWFsIHZvaWQgcmVzZXRCYWNrRm9yd2FyZExpc3QodW5zaWduZWQgbGlzdFNpemUs IHVuc2lnbmVkIGN1cnJlbnRJbmRleCkgPSAwOwogCisgICAgdmlydHVhbCB2b2lkIG9wZW5Qb3B1 cExpc3QoYm9vbCBtdWx0aXBsZSwgaW50IHNpemUsIGNvbnN0IFNjb3BlQXJyYXk8V2ViU3RyaW5n PiYgbGFiZWxzLCBjb25zdCBib29sKiBlbmFibGVkcywgY29uc3QgaW50KiBpdGVtVHlwZSwgY29u c3QgYm9vbCogc2VsZWN0ZWRzKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIG9wZW5EYXRlVGltZVBv cHVwKGludCB0eXBlLCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlLCBjb25zdCBXZWJTdHJpbmcmIG1p biwgY29uc3QgV2ViU3RyaW5nJiBtYXgsIGRvdWJsZSBzdGVwKSA9IDA7CiAgICAgdmlydHVhbCB2 b2lkIG9wZW5Db2xvclBvcHVwKGNvbnN0IFdlYlN0cmluZyYgdmFsdWUpID0gMDsKIApAQCAtMjUx LDcgKzI1Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJDYWNoZSgpID0gMDsK IAogICAgIHZpcnR1YWwgYm9vbCBoYXNLZXlib2FyZEZvY3VzKCkgPSAwOwotICAgIHZpcnR1YWwg dm9pZCBjcmVhdGVQb3B1cFdlYlZpZXcoY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHdlYlZpZXdS ZWN0KSA9IDA7CisgICAgdmlydHVhbCBib29sIGNyZWF0ZVBvcHVwV2ViVmlldyhjb25zdCBQbGF0 Zm9ybTo6SW50UmVjdCYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgY2xvc2VQb3B1cFdlYlZpZXco KSA9IDA7CiB9OwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5n ZUxvZwppbmRleCA0Mzg4YmIzLi43YmRlOGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyNSBAQAorMjAxMi0wNi0yMiAgQ3J5c3RhbCBaaGFuZyAgPGhhaXpoYW5n QHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFVzZSBBSVIgY29udHJvbHMgaWYgY2xp ZW50IGRvZXNuJ3Qgc3VwcG9ydCBIVE1MIGNvbnRyb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5Nzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5IEhUTUwgY29udHJvbHMgZGVwZW5kIG9u IGNsaWVudCBpbXBsZW1lbnRpbmcgQ3JlYXRlV2luZG93IGV2ZW50LCBmb3IgdGhvc2UgY2xpZW50 cworICAgICAgICB0aGF0IGRvbid0IGltcGxlbWVudCBDcmVhdGVXaW5kb3cgZXZlbnQsIHVzZSBv bGQgQUlSIGNvbnRyb2xzIHNvIHdlIGRvbid0IGJyZWFrIHRoZW0uCisKKyAgICAgICAgUFIgMTYz ODE4LgorCisgICAgICAgICogQXBpL1dlYlBhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3Jl U3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNo cm9tZUNsaWVudEJsYWNrQmVycnk6Om9wZW5QYWdlUG9wdXApOgorICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVBv cHVwQmxhY2tCZXJyeTo6c2VuZENyZWF0ZVBvcHVwV2ViVmlld1JlcXVlc3QpOgorICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuaDoKKyAgICAgICAgKFBhZ2VQb3B1 cEJsYWNrQmVycnkpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoK KyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpvcGVuU2VsZWN0UG9w dXApOgorCiAyMDEyLTA2LTIyICBBbmRyZXcgTG8gIDxhbmxvQHJpbS5jb20+CiAKICAgICAgICAg W0JsYWNrQmVycnldIFRhcCBoaWdobGlnaHQgZmFkZSBhbmltYXRpb25zIGFyZSBhZGRlZCB0byBv dmVybGF5IGNvbnRpbnVvdXNseSBkdXJpbmcgcGluY2ggem9vbS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5 LmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGll bnRCbGFja0JlcnJ5LmNwcAppbmRleCA1ODYyYTIwLi40ZDIwMjRiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJy eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9t ZUNsaWVudEJsYWNrQmVycnkuY3BwCkBAIC0zMDcsOCArMzA3LDExIEBAIFBhZ2VQb3B1cCogQ2hy b21lQ2xpZW50QmxhY2tCZXJyeTo6b3BlblBhZ2VQb3B1cChQYWdlUG9wdXBDbGllbnQqIGNsaWVu dCwgY29uc3QKIAogICAgIFBhZ2VQb3B1cEJsYWNrQmVycnkqIHdlYlBvcHVwID0gbmV3IFBhZ2VQ b3B1cEJsYWNrQmVycnkobV93ZWJQYWdlUHJpdmF0ZSwgY2xpZW50LCByb290Vmlld1RvU2NyZWVu KG9yaWdpbkJvdW5kc0luUm9vdFZpZXcpKTsKICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX3dlYlBh Z2UtPnBvcHVwT3BlbmVkKHdlYlBvcHVwKTsKLSAgICB3ZWJQb3B1cC0+c2VuZENyZWF0ZVBvcHVw V2ViVmlld1JlcXVlc3QoKTsKLSAgICByZXR1cm4gd2ViUG9wdXA7CisgICAgaWYgKHdlYlBvcHVw LT5zZW5kQ3JlYXRlUG9wdXBXZWJWaWV3UmVxdWVzdCgpKQorICAgICAgICByZXR1cm4gd2ViUG9w dXA7CisKKyAgICBjbG9zZVBhZ2VQb3B1cCgwKTsKKyAgICByZXR1cm4gMDsKIH0KIAogdm9pZCBD aHJvbWVDbGllbnRCbGFja0JlcnJ5OjpjbG9zZVBhZ2VQb3B1cChQYWdlUG9wdXAqKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJs YWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1Bh Z2VQb3B1cEJsYWNrQmVycnkuY3BwCmluZGV4IDAxZjdiYzguLmE3NTFmYjcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0Jl cnJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFn ZVBvcHVwQmxhY2tCZXJyeS5jcHAKQEAgLTU2LDkgKzU2LDkgQEAgUGFnZVBvcHVwQmxhY2tCZXJy eTo6flBhZ2VQb3B1cEJsYWNrQmVycnkoKQogewogfQogCi12b2lkIFBhZ2VQb3B1cEJsYWNrQmVy cnk6OnNlbmRDcmVhdGVQb3B1cFdlYlZpZXdSZXF1ZXN0KCkKK2Jvb2wgUGFnZVBvcHVwQmxhY2tC ZXJyeTo6c2VuZENyZWF0ZVBvcHVwV2ViVmlld1JlcXVlc3QoKQogewotICAgIG1fd2ViUGFnZVBy aXZhdGUtPmNsaWVudCgpLT5jcmVhdGVQb3B1cFdlYlZpZXcobV9yZWN0KTsKKyAgICByZXR1cm4g bV93ZWJQYWdlUHJpdmF0ZS0+Y2xpZW50KCktPmNyZWF0ZVBvcHVwV2ViVmlldyhtX3JlY3QpOwog fQogCiBib29sIFBhZ2VQb3B1cEJsYWNrQmVycnk6OmluaXQoV2ViUGFnZSogd2VicGFnZSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9w dXBCbGFja0JlcnJ5LmggYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQv UGFnZVBvcHVwQmxhY2tCZXJyeS5oCmluZGV4IDQ3NzRmMWUuLmM4MmU4YzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0Jl cnJ5LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQ b3B1cEJsYWNrQmVycnkuaApAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6CiAgICAgUGFnZVBvcHVw QmxhY2tCZXJyeShCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlKiwgUGFnZVBvcHVw Q2xpZW50KiwgY29uc3QgSW50UmVjdCYpOwogICAgIH5QYWdlUG9wdXBCbGFja0JlcnJ5KCk7CiAK LSAgICB2b2lkIHNlbmRDcmVhdGVQb3B1cFdlYlZpZXdSZXF1ZXN0KCk7CisgICAgYm9vbCBzZW5k Q3JlYXRlUG9wdXBXZWJWaWV3UmVxdWVzdCgpOwogICAgIGJvb2wgaW5pdChCbGFja0JlcnJ5OjpX ZWJLaXQ6OldlYlBhZ2UqKTsKICAgICB2b2lkIGNsb3NlUG9wdXAoKTsKICAgICB2b2lkIGluc3Rh bGxEb21GdW5jdGlvbihGcmFtZSopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAKaW5kZXggZWE2NzQxZC4uYjBmNTk4 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5w dXRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9y dC9JbnB1dEhhbmRsZXIuY3BwCkBAIC0xMTc0LDggKzExNzQsMTEgQEAgYm9vbCBJbnB1dEhhbmRs ZXI6Om9wZW5TZWxlY3RQb3B1cChIVE1MU2VsZWN0RWxlbWVudCogc2VsZWN0KQogICAgIH0KIAog ICAgIFNlbGVjdFBvcHVwQ2xpZW50KiBzZWxlY3RDbGllbnQgPSBuZXcgU2VsZWN0UG9wdXBDbGll bnQobXVsdGlwbGUsIHNpemUsIGxhYmVscywgZW5hYmxlZHMsIGl0ZW1UeXBlcywgc2VsZWN0ZWRz LCBtX3dlYlBhZ2UsIHNlbGVjdCk7Ci0gICAgV2ViQ29yZTo6SW50UmVjdCBlbGVtZW50UmVjdElu Um9vdFZpZXcgPSBzZWxlY3QtPmRvY3VtZW50KCktPnZpZXcoKS0+Y29udGVudHNUb1Jvb3RWaWV3 KHNlbGVjdC0+Z2V0UmVjdCgpKTsKLSAgICBtX3dlYlBhZ2UtPm1fcGFnZS0+Y2hyb21lKCktPmNs aWVudCgpLT5vcGVuUGFnZVBvcHVwKHNlbGVjdENsaWVudCwgZWxlbWVudFJlY3RJblJvb3RWaWV3 KTsKKyAgICBXZWJDb3JlOjpJbnRSZWN0IGVsZW1lbnRSZWN0SW5Sb290VmlldyA9IHNlbGVjdC0+ ZG9jdW1lbnQoKS0+dmlldygpLT5jb250ZW50c1RvUm9vdFZpZXcoZW5jbG9zaW5nSW50UmVjdChz ZWxlY3QtPmdldFJlY3QoKSkpOworICAgIGlmIChtX3dlYlBhZ2UtPm1fcGFnZS0+Y2hyb21lKCkt PmNsaWVudCgpLT5vcGVuUGFnZVBvcHVwKHNlbGVjdENsaWVudCwgZWxlbWVudFJlY3RJblJvb3RW aWV3KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgLy8gRmFpbCB0byBjcmVhdGUgSFRNTCBw b3B1cCwgdXNlIHRoZSBvbGQgcGF0aAorICAgIG1fd2ViUGFnZS0+bV9jbGllbnQtPm9wZW5Qb3B1 cExpc3QobXVsdGlwbGUsIHNpemUsIGxhYmVscywgZW5hYmxlZHMsIGl0ZW1UeXBlcywgc2VsZWN0 ZWRzKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotLSAKMS43LjEwLjEKCg== 149292 2012-06-25 07:54:00 -0700 2012-06-25 08:28:08 -0700 updated patch 0001-2012-06-22-Crystal-Zhang-haizhang-rim.com.patch text/plain 7193 haizhang RnJvbSA1ZGJmOWJhNTNlZjQwODk2YTVhYjk0YzZkZjk3YzM4YTE4MzY2NzgzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDcnlzdGFsIFpoYW5nIDxoYWl6aGFuZ0ByaW0uY29tPgpEYXRl OiBGcmksIDIyIEp1biAyMDEyIDE2OjQxOjU2IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMi0w Ni0yMiAgQ3J5c3RhbCBaaGFuZyAgPGhhaXpoYW5nQHJpbS5jb20+CgogICAgICAgIFtCbGFja0Jl cnJ5XSBVc2UgYWlyIGNvbnRyb2xzIGlmIGNsaWVudCBkb2Vzbid0IHN1cHBvcnQgSFRNTCBjb250 cm9sCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5Nzc3 CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBDdXJyZW50bHkg SFRNTCBjb250cm9scyBkZXBlbmQgb24gY2xpZW50IGltcGxlbWVudGluZyBDcmVhdGVXaW5kb3cg ZXZlbnQsIGZvciB0aG9zZSBjbGllbnRzCiAgICAgICAgdGhhdCBkb24ndCBpbXBsZW1lbnQgQ3Jl YXRlV2luZG93IGV2ZW50LCB1c2Ugb2xkIGFpciBjb250cm9scyBzbyB3ZSBkb24ndCBicmVhayB0 aGVtLgoKICAgICAgICBQUiAxNjM4MTguCgogICAgICAgICogQXBpL1dlYlBhZ2VDbGllbnQuaDoK ICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwOgogICAg ICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRCbGFja0JlcnJ5OjpvcGVuUGFnZVBvcHVwKToKICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwOgogICAgICAgIChX ZWJDb3JlOjpQYWdlUG9wdXBCbGFja0JlcnJ5OjpzZW5kQ3JlYXRlUG9wdXBXZWJWaWV3UmVxdWVz dCk6CiAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5Lmg6CiAgICAg ICAgKFBhZ2VQb3B1cEJsYWNrQmVycnkpOgogICAgICAgICogV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuY3BwOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6b3Bl blNlbGVjdFBvcHVwKToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2VD bGllbnQuaCAgICAgICB8ICAgIDMgKystCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICB8ICAgMjQgKysrKysrKysrKysrKysrKysrKysKIC4uLi9XZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcCAgICAgIHwgICAgNyArKysrLS0K IC4uLi9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmNwcCAgICAgICAgIHwgICAg NCArKy0tCiAuLi4vV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJyeS5oICAgICAgICAg ICB8ICAgIDIgKy0KIC4uLi9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNw cCAgICAgIHwgICAgNiArKystLQogNiBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNlcnRpb25zKCspLCA4 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkv V2ViUGFnZUNsaWVudC5oIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xp ZW50LmgKaW5kZXggMTMyZTZkMC4uN2NhMmZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlQ2xpZW50LmgKQEAgLTE2MCw2ICsxNjAsNyBAQCBwdWJsaWM6CiAKICAg ICB2aXJ0dWFsIHZvaWQgcmVzZXRCYWNrRm9yd2FyZExpc3QodW5zaWduZWQgbGlzdFNpemUsIHVu c2lnbmVkIGN1cnJlbnRJbmRleCkgPSAwOwogCisgICAgdmlydHVhbCB2b2lkIG9wZW5Qb3B1cExp c3QoYm9vbCBtdWx0aXBsZSwgaW50IHNpemUsIGNvbnN0IFNjb3BlQXJyYXk8V2ViU3RyaW5nPiYg bGFiZWxzLCBjb25zdCBib29sKiBlbmFibGVkcywgY29uc3QgaW50KiBpdGVtVHlwZSwgY29uc3Qg Ym9vbCogc2VsZWN0ZWRzKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIG9wZW5EYXRlVGltZVBvcHVw KGludCB0eXBlLCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlLCBjb25zdCBXZWJTdHJpbmcmIG1pbiwg Y29uc3QgV2ViU3RyaW5nJiBtYXgsIGRvdWJsZSBzdGVwKSA9IDA7CiAgICAgdmlydHVhbCB2b2lk IG9wZW5Db2xvclBvcHVwKGNvbnN0IFdlYlN0cmluZyYgdmFsdWUpID0gMDsKIApAQCAtMjUxLDcg KzI1Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgY2xlYXJDYWNoZSgpID0gMDsKIAog ICAgIHZpcnR1YWwgYm9vbCBoYXNLZXlib2FyZEZvY3VzKCkgPSAwOwotICAgIHZpcnR1YWwgdm9p ZCBjcmVhdGVQb3B1cFdlYlZpZXcoY29uc3QgUGxhdGZvcm06OkludFJlY3QmIHdlYlZpZXdSZWN0 KSA9IDA7CisgICAgdmlydHVhbCBib29sIGNyZWF0ZVBvcHVwV2ViVmlldyhjb25zdCBQbGF0Zm9y bTo6SW50UmVjdCYpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgY2xvc2VQb3B1cFdlYlZpZXcoKSA9 IDA7CiB9OwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxv ZwppbmRleCA0Mzg4YmIzLi5mZTlkMzhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyNyBAQAorMjAxMi0wNi0yMiAgQ3J5c3RhbCBaaGFuZyAgPGhhaXpoYW5nQHJp bS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIFVzZSBBSVIgY29udHJvbHMgaWYgY2xpZW50 IGRvZXNuJ3Qgc3VwcG9ydCBIVE1MIGNvbnRyb2wKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg5Nzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5IEhUTUwgY29udHJvbHMgZGVwZW5kIG9uIGNs aWVudCBpbXBsZW1lbnRpbmcgQ3JlYXRlV2luZG93IGV2ZW50LCBmb3IgdGhvc2UgY2xpZW50cwor ICAgICAgICB0aGF0IGRvbid0IGltcGxlbWVudCBDcmVhdGVXaW5kb3cgZXZlbnQsIHVzZSBvbGQg QUlSIGNvbnRyb2xzIHNvIHdlIGRvbid0IGJyZWFrIHRoZW0uCisKKyAgICAgICAgUFIgMTYzODE4 LgorCisgICAgICAgIEludGVybmFsIHJldmlld2VkIGJ5IE1pa2UgRmVudG9uLgorCisgICAgICAg ICogQXBpL1dlYlBhZ2VDbGllbnQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVD bGllbnRCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEJsYWNr QmVycnk6Om9wZW5QYWdlUG9wdXApOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1 cEJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZVBvcHVwQmxhY2tCZXJyeTo6 c2VuZENyZWF0ZVBvcHVwV2ViVmlld1JlcXVlc3QpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L1BhZ2VQb3B1cEJsYWNrQmVycnkuaDoKKyAgICAgICAgKFBhZ2VQb3B1cEJsYWNrQmVycnkpOgor ICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNr QmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpvcGVuU2VsZWN0UG9wdXApOgorCiAyMDEyLTA2 LTIyICBBbmRyZXcgTG8gIDxhbmxvQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFRh cCBoaWdobGlnaHQgZmFkZSBhbmltYXRpb25zIGFyZSBhZGRlZCB0byBvdmVybGF5IGNvbnRpbnVv dXNseSBkdXJpbmcgcGluY2ggem9vbS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNw cAppbmRleCA1ODYyYTIwLi40ZDIwMjRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNr YmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVy cnkuY3BwCkBAIC0zMDcsOCArMzA3LDExIEBAIFBhZ2VQb3B1cCogQ2hyb21lQ2xpZW50QmxhY2tC ZXJyeTo6b3BlblBhZ2VQb3B1cChQYWdlUG9wdXBDbGllbnQqIGNsaWVudCwgY29uc3QKIAogICAg IFBhZ2VQb3B1cEJsYWNrQmVycnkqIHdlYlBvcHVwID0gbmV3IFBhZ2VQb3B1cEJsYWNrQmVycnko bV93ZWJQYWdlUHJpdmF0ZSwgY2xpZW50LCByb290Vmlld1RvU2NyZWVuKG9yaWdpbkJvdW5kc0lu Um9vdFZpZXcpKTsKICAgICBtX3dlYlBhZ2VQcml2YXRlLT5tX3dlYlBhZ2UtPnBvcHVwT3BlbmVk KHdlYlBvcHVwKTsKLSAgICB3ZWJQb3B1cC0+c2VuZENyZWF0ZVBvcHVwV2ViVmlld1JlcXVlc3Qo KTsKLSAgICByZXR1cm4gd2ViUG9wdXA7CisgICAgaWYgKHdlYlBvcHVwLT5zZW5kQ3JlYXRlUG9w dXBXZWJWaWV3UmVxdWVzdCgpKQorICAgICAgICByZXR1cm4gd2ViUG9wdXA7CisKKyAgICBjbG9z ZVBhZ2VQb3B1cCgwKTsKKyAgICByZXR1cm4gMDsKIH0KIAogdm9pZCBDaHJvbWVDbGllbnRCbGFj a0JlcnJ5OjpjbG9zZVBhZ2VQb3B1cChQYWdlUG9wdXAqKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnkuY3BwIGIv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVy cnkuY3BwCmluZGV4IDAxZjdiYzguLmE3NTFmYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tCZXJy eS5jcHAKQEAgLTU2LDkgKzU2LDkgQEAgUGFnZVBvcHVwQmxhY2tCZXJyeTo6flBhZ2VQb3B1cEJs YWNrQmVycnkoKQogewogfQogCi12b2lkIFBhZ2VQb3B1cEJsYWNrQmVycnk6OnNlbmRDcmVhdGVQ b3B1cFdlYlZpZXdSZXF1ZXN0KCkKK2Jvb2wgUGFnZVBvcHVwQmxhY2tCZXJyeTo6c2VuZENyZWF0 ZVBvcHVwV2ViVmlld1JlcXVlc3QoKQogewotICAgIG1fd2ViUGFnZVByaXZhdGUtPmNsaWVudCgp LT5jcmVhdGVQb3B1cFdlYlZpZXcobV9yZWN0KTsKKyAgICByZXR1cm4gbV93ZWJQYWdlUHJpdmF0 ZS0+Y2xpZW50KCktPmNyZWF0ZVBvcHVwV2ViVmlldyhtX3JlY3QpOwogfQogCiBib29sIFBhZ2VQ b3B1cEJsYWNrQmVycnk6OmluaXQoV2ViUGFnZSogd2VicGFnZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5Lmgg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvUGFnZVBvcHVwQmxhY2tC ZXJyeS5oCmluZGV4IDQ3NzRmMWUuLmM4MmU4YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9QYWdlUG9wdXBCbGFja0JlcnJ5LmgKKysrIGIvU291 cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L1BhZ2VQb3B1cEJsYWNrQmVycnku aApAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6CiAgICAgUGFnZVBvcHVwQmxhY2tCZXJyeShCbGFj a0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlKiwgUGFnZVBvcHVwQ2xpZW50KiwgY29uc3Qg SW50UmVjdCYpOwogICAgIH5QYWdlUG9wdXBCbGFja0JlcnJ5KCk7CiAKLSAgICB2b2lkIHNlbmRD cmVhdGVQb3B1cFdlYlZpZXdSZXF1ZXN0KCk7CisgICAgYm9vbCBzZW5kQ3JlYXRlUG9wdXBXZWJW aWV3UmVxdWVzdCgpOwogICAgIGJvb2wgaW5pdChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2Uq KTsKICAgICB2b2lkIGNsb3NlUG9wdXAoKTsKICAgICB2b2lkIGluc3RhbGxEb21GdW5jdGlvbihG cmFtZSopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBw b3J0L0lucHV0SGFuZGxlci5jcHAKaW5kZXggZWE2NzQxZC4uNmU4MTQ4NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIu Y3BwCkBAIC0xMTc0LDggKzExNzQsMTAgQEAgYm9vbCBJbnB1dEhhbmRsZXI6Om9wZW5TZWxlY3RQ b3B1cChIVE1MU2VsZWN0RWxlbWVudCogc2VsZWN0KQogICAgIH0KIAogICAgIFNlbGVjdFBvcHVw Q2xpZW50KiBzZWxlY3RDbGllbnQgPSBuZXcgU2VsZWN0UG9wdXBDbGllbnQobXVsdGlwbGUsIHNp emUsIGxhYmVscywgZW5hYmxlZHMsIGl0ZW1UeXBlcywgc2VsZWN0ZWRzLCBtX3dlYlBhZ2UsIHNl bGVjdCk7Ci0gICAgV2ViQ29yZTo6SW50UmVjdCBlbGVtZW50UmVjdEluUm9vdFZpZXcgPSBzZWxl Y3QtPmRvY3VtZW50KCktPnZpZXcoKS0+Y29udGVudHNUb1Jvb3RWaWV3KHNlbGVjdC0+Z2V0UmVj dCgpKTsKLSAgICBtX3dlYlBhZ2UtPm1fcGFnZS0+Y2hyb21lKCktPmNsaWVudCgpLT5vcGVuUGFn ZVBvcHVwKHNlbGVjdENsaWVudCwgZWxlbWVudFJlY3RJblJvb3RWaWV3KTsKKyAgICBXZWJDb3Jl OjpJbnRSZWN0IGVsZW1lbnRSZWN0SW5Sb290VmlldyA9IHNlbGVjdC0+ZG9jdW1lbnQoKS0+dmll dygpLT5jb250ZW50c1RvUm9vdFZpZXcoZW5jbG9zaW5nSW50UmVjdChzZWxlY3QtPmdldFJlY3Qo KSkpOworICAgIC8vIEZhaWwgdG8gY3JlYXRlIEhUTUwgcG9wdXAsIHVzZSB0aGUgb2xkIHBhdGgK KyAgICBpZiAoIW1fd2ViUGFnZS0+bV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPm9wZW5QYWdl UG9wdXAoc2VsZWN0Q2xpZW50LCBlbGVtZW50UmVjdEluUm9vdFZpZXcpKQorICAgICAgICBtX3dl YlBhZ2UtPm1fY2xpZW50LT5vcGVuUG9wdXBMaXN0KG11bHRpcGxlLCBzaXplLCBsYWJlbHMsIGVu YWJsZWRzLCBpdGVtVHlwZXMsIHNlbGVjdGVkcyk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLS0g CjEuNy4xMC4xCgo=