112289 2013-03-13 13:54:58 -0700 [WK2][EFL] Get rid of WebPageProxy::viewWidget() method 2013-03-15 00:15:49 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mikhail.pozdnyakov mikhail.pozdnyakov gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 854599 0 mikhail.pozdnyakov 2013-03-13 13:54:58 -0700 SSIA. Heaving this method inside web page is broken design: web page should not be aware of platform-specific view. 854608 1 192990 mikhail.pozdnyakov 2013-03-13 14:05:15 -0700 Created attachment 192990 patch 854633 2 192990 kenneth 2013-03-13 14:31:47 -0700 Comment on attachment 192990 patch View in context: https://bugs.webkit.org/attachment.cgi?id=192990&action=review nice > Source/WebKit2/ChangeLog:9 > + Having viewWidget() method inside web page is broken design: web > + page should not be aware of platform-specific view. I would refrase that. 854781 3 192990 eflews.bot 2013-03-13 16:29:14 -0700 Comment on attachment 192990 patch Attachment 192990 did not pass efl-ews (efl): Output: http://webkit-commit-queue.appspot.com/results/17199068 855215 4 mikhail.pozdnyakov 2013-03-14 08:31:50 -0700 (In reply to comment #3) > (From update of attachment 192990 [details]) > Attachment 192990 [details] did not pass efl-ews (efl): > Output: http://webkit-commit-queue.appspot.com/results/17199068 Weird.. I cannot reproduce it locally. 855252 5 192990 gyuyoung.kim 2013-03-14 09:34:43 -0700 Comment on attachment 192990 patch View in context: https://bugs.webkit.org/attachment.cgi?id=192990&action=review > Source/WebKit2/PlatformEfl.cmake:-85 > - UIProcess/cairo/BackingStoreCairo.cpp To help you, I can reproduce build error when I build WebKit EFL with this patch locally. It looks these build error comes from removing this file. ../../lib/libewebkit2.so.0.1.0: undefined reference to `WebKit::BackingStore::paint(_cairo*, WebCore::IntRect const&)' ../../lib/libewebkit2.so.0.1.0: undefined reference to `WebKit::BackingStore::incorporateUpdate(WebKit::ShareableBitmap*, WebKit::UpdateInfo const&)' 855377 6 193165 mikhail.pozdnyakov 2013-03-14 11:49:06 -0700 Created attachment 193165 run EWS 855446 7 193176 mikhail.pozdnyakov 2013-03-14 13:18:10 -0700 Created attachment 193176 patch v2 fix build: do not exclude BackingStoreCairo.cpp from cmake. 855450 8 193176 ap 2013-03-14 13:26:39 -0700 Comment on attachment 193176 patch v2 r=me (largely taking in consideration Kenneth's approval). 855528 9 kenneth 2013-03-14 15:47:47 -0700 Great! 855755 10 193176 webkit.review.bot 2013-03-15 00:15:43 -0700 Comment on attachment 193176 patch v2 Clearing flags on attachment: 193176 Committed r145880: <http://trac.webkit.org/changeset/145880> 855757 11 webkit.review.bot 2013-03-15 00:15:49 -0700 All reviewed patches have been landed. Closing bug. 192990 2013-03-13 14:05:15 -0700 2013-03-14 11:49:06 -0700 patch bug112289 text/plain 5986 mikhail.pozdnyakov Y29tbWl0IGQ5ZDMyZDUyNzNlZDk1ZjliZjllNjQyOWI1YTQ4NmM5NmQwMzA1NGEKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg V2VkIE1hciAxMyAyMjo1ODowNyAyMDEzICswMjAwCgogICAgYnVnMTEyMjg5CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDI3YTliMmMuLmY1NThhNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxMy0w My0xMyAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbV0syXVtFRkxdIEdldCByaWQgb2YgV2ViUGFnZVByb3h5Ojp2aWV3V2lkZ2V0 KCkgbWV0aG9kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTIyODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBIYXZpbmcgdmlld1dpZGdldCgpIG1ldGhvZCBpbnNpZGUgd2ViIHBhZ2UgaXMgYnJva2VuIGRl c2lnbjogd2ViCisgICAgICAgIHBhZ2Ugc2hvdWxkIG5vdCBiZSBhd2FyZSBvZiBwbGF0Zm9ybS1z cGVjaWZpYyB2aWV3LgorCisgICAgICAgICogUGxhdGZvcm1FZmwuY21ha2U6CisKKyAgICAgICAg ICAgIFJlbW92ZWQgQmFja2luZ1N0b3JlQ2Fpcm8uY3BwIGFzIGl0IGlzIG5vdCB1c2VkLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAgICh3a1BhZ2VU b0V2YXNPYmplY3RNYXApOgorICAgICAgICAoRXdrVmlldzo6RXdrVmlldyk6CisgICAgICAgIChF d2tWaWV3Ojp+RXdrVmlldyk6CisgICAgICAgIChFd2tWaWV3OjpjcmVhdGVFdmFzT2JqZWN0KToK KyAgICAgICAgKEV3a1ZpZXc6OnRvRXZhc09iamVjdCk6CisKKyAgICAgICAgICAgIEV3a1ZpZXc6 OnRvRXZhc09iamVjdCgpIHJlbGllcyBvbiBzdGF0aWMgbWFwIHJhdGhlciB0aGFuIG9uCisgICAg ICAgICAgICByZW1vdmVkIFdlYlBhZ2VQcm94eTo6dmlld1dpZGdldCgpIG1ldGhvZC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a190ZXh0X2NoZWNrZXIuY3BwOgorICAgICAgICAo dW5pcXVlU3BlbGxEb2N1bWVudFRhZyk6CisKKyAgICAgICAgICAgIE5vdyB1c2VzIEV3a1ZpZXc6 OnRvRXZhc09iamVjdCgpLiAKKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoK KyAgICAgICAgKFdlYlBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJQYWdl UHJveHlFZmwuY3BwOgorCisgICAgICAgICAgICBSZW1vdmVkIFdlYlBhZ2VQcm94eTo6dmlld1dp ZGdldCgpIG1ldGhvZC4KKwogMjAxMy0wMy0xMyAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBnZXQgcmlkIG9mIGhpZGRlblBh bmVscyBmaWx0ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtl IGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKaW5kZXggOGY2YjliYS4uMDA2YzJj YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKKysrIGIvU291 cmNlL1dlYktpdDIvUGxhdGZvcm1FZmwuY21ha2UKQEAgLTgyLDggKzgyLDYgQEAgbGlzdChBUFBF TkQgV2ViS2l0Ml9TT1VSQ0VTCiAgICAgVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCiAg ICAgVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3dpbmRvd19mZWF0dXJlcy5jcHAKIAotICAgIFVJUHJv Y2Vzcy9jYWlyby9CYWNraW5nU3RvcmVDYWlyby5jcHAKLQogICAgIFVJUHJvY2Vzcy9lZmwvQmF0 dGVyeVByb3ZpZGVyLmNwcAogICAgIFVJUHJvY2Vzcy9lZmwvQ29udGV4dEhpc3RvcnlDbGllbnRF ZmwuY3BwCiAgICAgVUlQcm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAKaW5kZXggMDdkNzI2Ni4u NTllZDIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdr Vmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5j cHAKQEAgLTIyNiw2ICsyMjYsMTQgQEAgdm9pZCBFd2tWaWV3RXZlbnRIYW5kbGVyPEVWQVNfQ0FM TEJBQ0tfSElERT46OmhhbmRsZUV2ZW50KHZvaWQqIGRhdGEsIEV2YXMqLCBFdmEKICAgICB0b0V3 a1ZpZXcoc21hcnREYXRhKS0+cGFnZSgpLT52aWV3U3RhdGVEaWRDaGFuZ2UoV2ViUGFnZVByb3h5 OjpWaWV3SXNWaXNpYmxlKTsKIH0KIAordHlwZWRlZiBIYXNoTWFwPFdLUGFnZVJlZiwgRXZhc19P YmplY3QqPiBXS1BhZ2VUb0V2YXNPYmplY3RNYXA7CisKK3N0YXRpYyBpbmxpbmUgV0tQYWdlVG9F dmFzT2JqZWN0TWFwJiB3a1BhZ2VUb0V2YXNPYmplY3RNYXAoKQoreworICAgIERFRklORV9TVEFU SUNfTE9DQUwoV0tQYWdlVG9FdmFzT2JqZWN0TWFwLCBtYXAsICgpKTsKKyAgICByZXR1cm4gbWFw OworfQorCiAvLyBFd2tWaWV3IGltcGxlbWVudGF0aW9uLgogCiBFd2tWaWV3OjpFd2tWaWV3KEV2 YXNfT2JqZWN0KiBldmFzT2JqZWN0LCBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+IGNvbnRleHQsIFdL UGFnZUdyb3VwUmVmIHBhZ2VHcm91cCwgVmlld0JlaGF2aW9yIGJlaGF2aW9yKQpAQCAtMjkzLDYg KzMwMSw5IEBAIEV3a1ZpZXc6OkV3a1ZpZXcoRXZhc19PYmplY3QqIGV2YXNPYmplY3QsIFBhc3NS ZWZQdHI8RXdrQ29udGV4dD4gY29udGV4dCwgV0tQYWdlCiAgICAgQVNTRVJUKGljb25EYXRhYmFz ZSk7CiAKICAgICBpY29uRGF0YWJhc2UtPndhdGNoQ2hhbmdlcyhJY29uQ2hhbmdlQ2FsbGJhY2tE YXRhKEV3a1ZpZXc6OmhhbmRsZUZhdmljb25DaGFuZ2VkLCB0aGlzKSk7CisKKyAgICBXS1BhZ2VU b0V2YXNPYmplY3RNYXA6OkFkZFJlc3VsdCByZXN1bHQgPSB3a1BhZ2VUb0V2YXNPYmplY3RNYXAo KS5hZGQod2tQYWdlKCksIG1fZXZhc09iamVjdCk7CisgICAgQVNTRVJUX1VOVVNFRChyZXN1bHQs IHJlc3VsdC5pc05ld0VudHJ5KTsKIH0KIAogRXdrVmlldzo6fkV3a1ZpZXcoKQpAQCAtMzAyLDYg KzMxMyw5IEBAIEV3a1ZpZXc6On5Fd2tWaWV3KCkKICAgICBBU1NFUlQoaWNvbkRhdGFiYXNlKTsK IAogICAgIGljb25EYXRhYmFzZS0+dW53YXRjaENoYW5nZXMoRXdrVmlldzo6aGFuZGxlRmF2aWNv bkNoYW5nZWQpOworCisgICAgQVNTRVJUKHdrUGFnZVRvRXZhc09iamVjdE1hcCgpLmdldCh3a1Bh Z2UoKSkgPT0gbV9ldmFzT2JqZWN0KTsKKyAgICB3a1BhZ2VUb0V2YXNPYmplY3RNYXAoKS5yZW1v dmUod2tQYWdlKCkpOwogfQogCiBFdmFzX09iamVjdCogRXdrVmlldzo6Y3JlYXRlRXZhc09iamVj dChFdmFzKiBjYW52YXMsIEV2YXNfU21hcnQqIHNtYXJ0LCBQYXNzUmVmUHRyPEV3a0NvbnRleHQ+ IGNvbnRleHQsIFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZiwgVmlld0JlaGF2aW9yIGJlaGF2 aW9yKQpAQCAtMzcyLDcgKzM4Niw3IEBAIGJvb2wgRXdrVmlldzo6aW5pdFNtYXJ0Q2xhc3NJbnRl cmZhY2UoRXdrX1ZpZXdfU21hcnRfQ2xhc3MmIGFwaSkKIGNvbnN0IEV2YXNfT2JqZWN0KiBFd2tW aWV3Ojp0b0V2YXNPYmplY3QoV0tQYWdlUmVmIHBhZ2UpCiB7CiAgICAgQVNTRVJUKHBhZ2UpOwot ICAgIHJldHVybiB0b0ltcGwocGFnZSktPnZpZXdXaWRnZXQoKTsKKyAgICByZXR1cm4gd2tQYWdl VG9FdmFzT2JqZWN0TWFwKCkuZ2V0KHBhZ2UpOwogfQogCiBXS1BhZ2VSZWYgRXdrVmlldzo6d2tQ YWdlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a190ZXh0X2NoZWNrZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3RleHRfY2hlY2tlci5jcHAKaW5kZXggMmJlMjhjNC4uMzg2Y2E3OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3RleHRfY2hlY2tlci5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3RleHRfY2hlY2tlci5jcHAK QEAgLTI5LDYgKzI5LDcgQEAKIAogI2lmIEVOQUJMRShTUEVMTENIRUNLKQogCisjaW5jbHVkZSAi RXdrVmlldy5oIgogI2luY2x1ZGUgIlRleHRDaGVja2VyRW5jaGFudC5oIgogI2luY2x1ZGUgIldL QVBJQ2FzdC5oIgogI2luY2x1ZGUgIldLRWluYVNoYXJlZFN0cmluZy5oIgpAQCAtODQsNyArODUs NyBAQCBzdGF0aWMgdm9pZCBzZXRDb250aW51b3VzU3BlbGxDaGVja2luZ0VuYWJsZWQoYm9vbCBl bmFibGVkLCBjb25zdCB2b2lkKikKIHN0YXRpYyB1aW50NjRfdCB1bmlxdWVTcGVsbERvY3VtZW50 VGFnKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKikKIHsKICAgICBpZiAoY2xpZW50Q2FsbGJh Y2tzKCkudW5pcXVlX3NwZWxsX2RvY3VtZW50X3RhZ19nZXQpCi0gICAgICAgIHJldHVybiBjbGll bnRDYWxsYmFja3MoKS51bmlxdWVfc3BlbGxfZG9jdW1lbnRfdGFnX2dldCh0b0ltcGwocGFnZSkt PnZpZXdXaWRnZXQoKSk7CisgICAgICAgIHJldHVybiBjbGllbnRDYWxsYmFja3MoKS51bmlxdWVf c3BlbGxfZG9jdW1lbnRfdGFnX2dldChFd2tWaWV3Ojp0b0V2YXNPYmplY3QocGFnZSkpOwogCiAg ICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5k ZXggNjBhYTlmNi4uMzNhNWMyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaApAQCAtMTI0LDggKzEyNCw2IEBAIGNsYXNzIFdLVmlldzsKIAogI2lmIFBMQVRGT1JNKEdU SykKIHR5cGVkZWYgR3RrV2lkZ2V0KiBQbGF0Zm9ybVdpZGdldDsKLSNlbGlmIFBMQVRGT1JNKEVG TCkKLXR5cGVkZWYgRXZhc19PYmplY3QqIFBsYXRmb3JtV2lkZ2V0OwogI2VuZGlmCiAKIG5hbWVz cGFjZSBXZWJLaXQgewpAQCAtNDE5LDcgKzQxNyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldENv bXBvc2l0aW9uKGNvbnN0IFN0cmluZyYsIFZlY3RvcjxXZWJDb3JlOjpDb21wb3NpdGlvblVuZGVy bGluZT4mLCBpbnQpOwogICAgIHZvaWQgY2FuY2VsQ29tcG9zaXRpb24oKTsKICNlbmRpZgotI2lm IFVTRShDQUlSTykKKyNpZiBQTEFURk9STShHVEspCiAgICAgUGxhdGZvcm1XaWRnZXQgdmlld1dp ZGdldCgpOwogI2VuZGlmCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlBhZ2VQcm94eUVmbC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlBhZ2VQcm94eUVmbC5jcHAKaW5kZXggMzAxMGU4 Ny4uYTVlNDRlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQ YWdlUHJveHlFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViUGFn ZVByb3h5RWZsLmNwcApAQCAtMzgsMTEgKzM4LDYgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK LUV2YXNfT2JqZWN0KiBXZWJQYWdlUHJveHk6OnZpZXdXaWRnZXQoKQotewotICAgIHJldHVybiBz dGF0aWNfY2FzdDxXZWJWaWV3Kj4obV9wYWdlQ2xpZW50KS0+ZXZhc09iamVjdCgpOwotfQotCiBT dHJpbmcgV2ViUGFnZVByb3h5OjpzdGFuZGFyZFVzZXJBZ2VudChjb25zdCBTdHJpbmcmIC8qYXBw bGljYXRpb25OYW1lRm9yVXNlckFnZW50Ki8pCiB7CiAgICAgV1RGOjpTdHJpbmcgcGxhdGZvcm07 Cg== 193165 2013-03-14 11:49:06 -0700 2013-03-14 13:18:10 -0700 run EWS bug112289_v2 text/plain 6893 mikhail.pozdnyakov Y29tbWl0IGMwMDA5MzQ0OWEyMDY0YWUzZTg4Y2VkNWE4MWIwZTUwZDE1NjA1NTYKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IE1hciAxNCAyMDo0Mzo0NCAyMDEzICswMjAwCgogICAgYnVnMTEyMjg5CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDIyMTQwZTkuLjRjNjEzYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAxMy0w My0xNCAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbV0syXVtFRkxdIEdldCByaWQgb2YgV2ViUGFnZVByb3h5Ojp2aWV3V2lkZ2V0 KCkgbWV0aG9kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTIyODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBIYXZpbmcgdmlld1dpZGdldCgpIG1ldGhvZCBpbnNpZGUgd2ViIHBhZ2UgaXMgYnJva2VuIGRl c2lnbjogd2ViCisgICAgICAgIHBhZ2Ugc2hvdWxkIG5vdCBiZSBhd2FyZSBvZiBwbGF0Zm9ybS1z cGVjaWZpYyB2aWV3LgorCisgICAgICAgICogUGxhdGZvcm1FZmwuY21ha2U6CisKKyAgICAgICAg ICAgIFJlbW92ZWQgQmFja2luZ1N0b3JlQ2Fpcm8uY3BwIGFzIGl0IGlzIG5vdCB1c2VkLgorCisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAgICh3a1BhZ2VU b0V2YXNPYmplY3RNYXApOgorICAgICAgICAoRXdrVmlldzo6RXdrVmlldyk6CisgICAgICAgIChF d2tWaWV3Ojp+RXdrVmlldyk6CisgICAgICAgIChFd2tWaWV3OjpjcmVhdGVFdmFzT2JqZWN0KToK KyAgICAgICAgKEV3a1ZpZXc6OnRvRXZhc09iamVjdCk6CisKKyAgICAgICAgICAgIEV3a1ZpZXc6 OnRvRXZhc09iamVjdCgpIHJlbGllcyBvbiBzdGF0aWMgbWFwIHJhdGhlciB0aGFuIG9uCisgICAg ICAgICAgICByZW1vdmVkIFdlYlBhZ2VQcm94eTo6dmlld1dpZGdldCgpIG1ldGhvZC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a190ZXh0X2NoZWNrZXIuY3BwOgorICAgICAgICAo dW5pcXVlU3BlbGxEb2N1bWVudFRhZyk6CisKKyAgICAgICAgICAgIE5vdyB1c2VzIEV3a1ZpZXc6 OnRvRXZhc09iamVjdCgpLiAKKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoK KyAgICAgICAgKFdlYlBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJQYWdl UHJveHlFZmwuY3BwOgorCisgICAgICAgICAgICBSZW1vdmVkIFdlYlBhZ2VQcm94eTo6dmlld1dp ZGdldCgpIG1ldGhvZC4KKwogMjAxMy0wMy0xNCAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJlcGxhY2Ugc3RhdGljX2Nhc3RzIHdpdGggdG8qIGhlbHBl ciBmdW5jdGlvbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUVmbC5jbWFr ZSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCmluZGV4IDc4NGRjZDIuLjg2YWMw MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1BsYXRmb3JtRWZsLmNtYWtlCkBAIC04NCw4ICs4NCw2IEBAIGxpc3QoQVBQ RU5EIFdlYktpdDJfU09VUkNFUwogICAgIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAog ICAgIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a193aW5kb3dfZmVhdHVyZXMuY3BwCiAKLSAgICBVSVBy b2Nlc3MvY2Fpcm8vQmFja2luZ1N0b3JlQ2Fpcm8uY3BwCi0KICAgICBVSVByb2Nlc3MvZWZsL0Jh dHRlcnlQcm92aWRlci5jcHAKICAgICBVSVByb2Nlc3MvZWZsL0NvbnRleHRIaXN0b3J5Q2xpZW50 RWZsLmNwcAogICAgIFVJUHJvY2Vzcy9lZmwvQ29udGV4dE1lbnVDbGllbnRFZmwuY3BwCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCmluZGV4IGNlN2Q2YWMu LjNlY2RhZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3 a1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcu Y3BwCkBAIC0yMjcsNiArMjI3LDE0IEBAIHZvaWQgRXdrVmlld0V2ZW50SGFuZGxlcjxFVkFTX0NB TExCQUNLX0hJREU+OjpoYW5kbGVFdmVudCh2b2lkKiBkYXRhLCBFdmFzKiwgRXZhCiAgICAgdG9F d2tWaWV3KHNtYXJ0RGF0YSktPnBhZ2UoKS0+dmlld1N0YXRlRGlkQ2hhbmdlKFdlYlBhZ2VQcm94 eTo6Vmlld0lzVmlzaWJsZSk7CiB9CiAKK3R5cGVkZWYgSGFzaE1hcDxXS1BhZ2VSZWYsIEV2YXNf T2JqZWN0Kj4gV0tQYWdlVG9FdmFzT2JqZWN0TWFwOworCitzdGF0aWMgaW5saW5lIFdLUGFnZVRv RXZhc09iamVjdE1hcCYgd2tQYWdlVG9FdmFzT2JqZWN0TWFwKCkKK3sKKyAgICBERUZJTkVfU1RB VElDX0xPQ0FMKFdLUGFnZVRvRXZhc09iamVjdE1hcCwgbWFwLCAoKSk7CisgICAgcmV0dXJuIG1h cDsKK30KKwogLy8gRXdrVmlldyBpbXBsZW1lbnRhdGlvbi4KIAogRXdrVmlldzo6RXdrVmlldyhF dmFzX09iamVjdCogZXZhc09iamVjdCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBjb250ZXh0LCBQ YXNzUmVmUHRyPEV3a1BhZ2VHcm91cD4gcGFnZUdyb3VwLCBWaWV3QmVoYXZpb3IgYmVoYXZpb3Ip CkBAIC0yOTUsNiArMzAzLDkgQEAgRXdrVmlldzo6RXdrVmlldyhFdmFzX09iamVjdCogZXZhc09i amVjdCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBjb250ZXh0LCBQYXNzUmUKICAgICBBU1NFUlQo aWNvbkRhdGFiYXNlKTsKIAogICAgIGljb25EYXRhYmFzZS0+d2F0Y2hDaGFuZ2VzKEljb25DaGFu Z2VDYWxsYmFja0RhdGEoRXdrVmlldzo6aGFuZGxlRmF2aWNvbkNoYW5nZWQsIHRoaXMpKTsKKwor ICAgIFdLUGFnZVRvRXZhc09iamVjdE1hcDo6QWRkUmVzdWx0IHJlc3VsdCA9IHdrUGFnZVRvRXZh c09iamVjdE1hcCgpLmFkZCh3a1BhZ2UoKSwgbV9ldmFzT2JqZWN0KTsKKyAgICBBU1NFUlRfVU5V U0VEKHJlc3VsdCwgcmVzdWx0LmlzTmV3RW50cnkpOwogfQogCiBFd2tWaWV3Ojp+RXdrVmlldygp CkBAIC0zMDQsNiArMzE1LDkgQEAgRXdrVmlldzo6fkV3a1ZpZXcoKQogICAgIEFTU0VSVChpY29u RGF0YWJhc2UpOwogCiAgICAgaWNvbkRhdGFiYXNlLT51bndhdGNoQ2hhbmdlcyhFd2tWaWV3Ojpo YW5kbGVGYXZpY29uQ2hhbmdlZCk7CisKKyAgICBBU1NFUlQod2tQYWdlVG9FdmFzT2JqZWN0TWFw KCkuZ2V0KHdrUGFnZSgpKSA9PSBtX2V2YXNPYmplY3QpOworICAgIHdrUGFnZVRvRXZhc09iamVj dE1hcCgpLnJlbW92ZSh3a1BhZ2UoKSk7CiB9CiAKIEV2YXNfT2JqZWN0KiBFd2tWaWV3OjpjcmVh dGVFdmFzT2JqZWN0KEV2YXMqIGNhbnZhcywgRXZhc19TbWFydCogc21hcnQsIFBhc3NSZWZQdHI8 RXdrQ29udGV4dD4gY29udGV4dCwgUGFzc1JlZlB0cjxFd2tQYWdlR3JvdXA+IHBhZ2VHcm91cCwg Vmlld0JlaGF2aW9yIGJlaGF2aW9yKQpAQCAtMzczLDcgKzM4Nyw3IEBAIGJvb2wgRXdrVmlldzo6 aW5pdFNtYXJ0Q2xhc3NJbnRlcmZhY2UoRXdrX1ZpZXdfU21hcnRfQ2xhc3MmIGFwaSkKIGNvbnN0 IEV2YXNfT2JqZWN0KiBFd2tWaWV3Ojp0b0V2YXNPYmplY3QoV0tQYWdlUmVmIHBhZ2UpCiB7CiAg ICAgQVNTRVJUKHBhZ2UpOwotICAgIHJldHVybiB0b0ltcGwocGFnZSktPnZpZXdXaWRnZXQoKTsK KyAgICByZXR1cm4gd2tQYWdlVG9FdmFzT2JqZWN0TWFwKCkuZ2V0KHBhZ2UpOwogfQogCiBXS1Bh Z2VSZWYgRXdrVmlldzo6d2tQYWdlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a190ZXh0X2NoZWNrZXIuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3RleHRfY2hlY2tlci5jcHAKaW5kZXggMmJlMjhjNC4uMzg2 Y2E3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3Rl eHRfY2hlY2tlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3RleHRfY2hlY2tlci5jcHAKQEAgLTI5LDYgKzI5LDcgQEAKIAogI2lmIEVOQUJMRShTUEVMTENI RUNLKQogCisjaW5jbHVkZSAiRXdrVmlldy5oIgogI2luY2x1ZGUgIlRleHRDaGVja2VyRW5jaGFu dC5oIgogI2luY2x1ZGUgIldLQVBJQ2FzdC5oIgogI2luY2x1ZGUgIldLRWluYVNoYXJlZFN0cmlu Zy5oIgpAQCAtODQsNyArODUsNyBAQCBzdGF0aWMgdm9pZCBzZXRDb250aW51b3VzU3BlbGxDaGVj a2luZ0VuYWJsZWQoYm9vbCBlbmFibGVkLCBjb25zdCB2b2lkKikKIHN0YXRpYyB1aW50NjRfdCB1 bmlxdWVTcGVsbERvY3VtZW50VGFnKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKikKIHsKICAg ICBpZiAoY2xpZW50Q2FsbGJhY2tzKCkudW5pcXVlX3NwZWxsX2RvY3VtZW50X3RhZ19nZXQpCi0g ICAgICAgIHJldHVybiBjbGllbnRDYWxsYmFja3MoKS51bmlxdWVfc3BlbGxfZG9jdW1lbnRfdGFn X2dldCh0b0ltcGwocGFnZSktPnZpZXdXaWRnZXQoKSk7CisgICAgICAgIHJldHVybiBjbGllbnRD YWxsYmFja3MoKS51bmlxdWVfc3BlbGxfZG9jdW1lbnRfdGFnX2dldChFd2tWaWV3Ojp0b0V2YXNP YmplY3QocGFnZSkpOwogCiAgICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQmFja2luZ1N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QmFja2luZ1N0b3JlLmgKaW5kZXggN2MyNjEzZi4uN2U1NzcxNyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0JhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9CYWNraW5nU3RvcmUuaApAQCAtMzksNyArMzksNyBAQAogI2luY2x1ZGUgPFF0R3Vp L1FQaXhtYXA+CiAjZW5kaWYKIAotI2lmIFVTRShDQUlSTykKKyNpZiBVU0UoQ0FJUk8pICYmICFQ TEFURk9STShFRkwpCiAjaW5jbHVkZSA8UmVmUHRyQ2Fpcm8uaD4KICNpbmNsdWRlIDxXZWJDb3Jl L1dpZGdldEJhY2tpbmdTdG9yZS5oPgogI2VuZGlmCkBAIC02NCw3ICs2NCw3IEBAIHB1YmxpYzoK ICAgICB0eXBlZGVmIENHQ29udGV4dFJlZiBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dDsKICNlbGlm IFBMQVRGT1JNKFFUKQogICAgIHR5cGVkZWYgUVBhaW50ZXIqIFBsYXRmb3JtR3JhcGhpY3NDb250 ZXh0OwotI2VsaWYgVVNFKENBSVJPKQorI2VsaWYgVVNFKENBSVJPKSAmJiAhUExBVEZPUk0oRUZM KQogICAgIHR5cGVkZWYgY2Fpcm9fdCogUGxhdGZvcm1HcmFwaGljc0NvbnRleHQ7CiAjZW5kaWYK IApAQCAtOTgsNyArOTgsNyBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkludFNpemUgbV9zY3Jv bGxlZFJlY3RPZmZzZXQ7CiAjZWxpZiBQTEFURk9STShRVCkKICAgICBRUGl4bWFwIG1fcGl4bWFw OwotI2VsaWYgVVNFKENBSVJPKQorI2VsaWYgVVNFKENBSVJPKSAmJiAhUExBVEZPUk0oRUZMKQog ICAgIE93blB0cjxXZWJDb3JlOjpXaWRnZXRCYWNraW5nU3RvcmU+IG1fYmFja2luZ1N0b3JlOwog I2VuZGlmCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDYw YWE5ZjYuLjMzYTVjMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK QEAgLTEyNCw4ICsxMjQsNiBAQCBjbGFzcyBXS1ZpZXc7CiAKICNpZiBQTEFURk9STShHVEspCiB0 eXBlZGVmIEd0a1dpZGdldCogUGxhdGZvcm1XaWRnZXQ7Ci0jZWxpZiBQTEFURk9STShFRkwpCi10 eXBlZGVmIEV2YXNfT2JqZWN0KiBQbGF0Zm9ybVdpZGdldDsKICNlbmRpZgogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKQEAgLTQxOSw3ICs0MTcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb21wb3Np dGlvbihjb25zdCBTdHJpbmcmLCBWZWN0b3I8V2ViQ29yZTo6Q29tcG9zaXRpb25VbmRlcmxpbmU+ JiwgaW50KTsKICAgICB2b2lkIGNhbmNlbENvbXBvc2l0aW9uKCk7CiAjZW5kaWYKLSNpZiBVU0Uo Q0FJUk8pCisjaWYgUExBVEZPUk0oR1RLKQogICAgIFBsYXRmb3JtV2lkZ2V0IHZpZXdXaWRnZXQo KTsKICNlbmRpZgogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwuY3BwCmluZGV4IDMwMTBlODcuLmE1 ZTQ0ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViUGFnZVBy b3h5RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlBhZ2VQcm94 eUVmbC5jcHAKQEAgLTM4LDExICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1FdmFz X09iamVjdCogV2ViUGFnZVByb3h5Ojp2aWV3V2lkZ2V0KCkKLXsKLSAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8V2ViVmlldyo+KG1fcGFnZUNsaWVudCktPmV2YXNPYmplY3QoKTsKLX0KLQogU3RyaW5n IFdlYlBhZ2VQcm94eTo6c3RhbmRhcmRVc2VyQWdlbnQoY29uc3QgU3RyaW5nJiAvKmFwcGxpY2F0 aW9uTmFtZUZvclVzZXJBZ2VudCovKQogewogICAgIFdURjo6U3RyaW5nIHBsYXRmb3JtOwo= 193176 2013-03-14 13:18:10 -0700 2013-03-15 00:15:43 -0700 patch v2 bug112289_v2 text/plain 6788 mikhail.pozdnyakov Y29tbWl0IGEwM2VmMmJlYWU1OTA5NDRmMjBlM2QxNTEzMjE5MzMwYmEyYmVjOGEKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IE1hciAxNCAyMjowODo0MiAyMDEzICswMjAwCgogICAgYnVnMTEyMjg5CgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDIyMTQwZTkuLmY5ODIzZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMy0w My0xNCAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4K KworICAgICAgICBbV0syXVtFRkxdIEdldCByaWQgb2YgV2ViUGFnZVByb3h5Ojp2aWV3V2lkZ2V0 KCkgbWV0aG9kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMTIyODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWIgcGFnZSBzaG91bGQgbm90IGJlIGF3YXJlIG9mIHBsYXRmb3JtLXNwZWNpZmljIHZpZXcu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcDoKKyAgICAgICAgKHdr UGFnZVRvRXZhc09iamVjdE1hcCk6CisgICAgICAgIChFd2tWaWV3OjpFd2tWaWV3KToKKyAgICAg ICAgKEV3a1ZpZXc6On5Fd2tWaWV3KToKKyAgICAgICAgKEV3a1ZpZXc6OnRvRXZhc09iamVjdCk6 CisKKyAgICAgICAgICAgIEV3a1ZpZXc6OnRvRXZhc09iamVjdCgpIHJlbGllcyBvbiBzdGF0aWMg bWFwIHJhdGhlciB0aGFuIG9uCisgICAgICAgICAgICByZW1vdmVkIFdlYlBhZ2VQcm94eTo6dmll d1dpZGdldCgpIG1ldGhvZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdGV4dF9jaGVja2VyLmNwcDoKKyAg ICAgICAgKHVuaXF1ZVNwZWxsRG9jdW1lbnRUYWcpOgorICAgICAgICAqIFVJUHJvY2Vzcy9jYWly by9CYWNraW5nU3RvcmVDYWlyby5jcHA6CisgICAgICAgIChXZWJLaXQ6OkJhY2tpbmdTdG9yZTo6 aW5jb3Jwb3JhdGVVcGRhdGUpOgorCisgICAgICAgICAgICBOb3cgdXNlcyBFd2tWaWV3Ojp0b0V2 YXNPYmplY3QoKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAg ICAgKFdlYlBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlF ZmwuY3BwOgorCisgICAgICAgICAgICBSZW1vdmVkIFdlYlBhZ2VQcm94eTo6dmlld1dpZGdldCgp IG1ldGhvZC4KKwogMjAxMy0wMy0xNCAgQWJoaXNoZWsgQXJ5YSAgPGluZmVybm9AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJlcGxhY2Ugc3RhdGljX2Nhc3RzIHdpdGggdG8qIGhlbHBlciBmdW5j dGlvbnMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tW aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCmlu ZGV4IGNlN2Q2YWMuLjE3ZGNiNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL0V3a1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL0V3a1ZpZXcuY3BwCkBAIC0yMjcsNiArMjI3LDE0IEBAIHZvaWQgRXdrVmlld0V2ZW50SGFu ZGxlcjxFVkFTX0NBTExCQUNLX0hJREU+OjpoYW5kbGVFdmVudCh2b2lkKiBkYXRhLCBFdmFzKiwg RXZhCiAgICAgdG9Fd2tWaWV3KHNtYXJ0RGF0YSktPnBhZ2UoKS0+dmlld1N0YXRlRGlkQ2hhbmdl KFdlYlBhZ2VQcm94eTo6Vmlld0lzVmlzaWJsZSk7CiB9CiAKK3R5cGVkZWYgSGFzaE1hcDxXS1Bh Z2VSZWYsIEV2YXNfT2JqZWN0Kj4gV0tQYWdlVG9FdmFzT2JqZWN0TWFwOworCitzdGF0aWMgaW5s aW5lIFdLUGFnZVRvRXZhc09iamVjdE1hcCYgd2tQYWdlVG9FdmFzT2JqZWN0TWFwKCkKK3sKKyAg ICBERUZJTkVfU1RBVElDX0xPQ0FMKFdLUGFnZVRvRXZhc09iamVjdE1hcCwgbWFwLCAoKSk7Cisg ICAgcmV0dXJuIG1hcDsKK30KKwogLy8gRXdrVmlldyBpbXBsZW1lbnRhdGlvbi4KIAogRXdrVmll dzo6RXdrVmlldyhFdmFzX09iamVjdCogZXZhc09iamVjdCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0 PiBjb250ZXh0LCBQYXNzUmVmUHRyPEV3a1BhZ2VHcm91cD4gcGFnZUdyb3VwLCBWaWV3QmVoYXZp b3IgYmVoYXZpb3IpCkBAIC0yOTUsNiArMzAzLDkgQEAgRXdrVmlldzo6RXdrVmlldyhFdmFzX09i amVjdCogZXZhc09iamVjdCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0PiBjb250ZXh0LCBQYXNzUmUK ICAgICBBU1NFUlQoaWNvbkRhdGFiYXNlKTsKIAogICAgIGljb25EYXRhYmFzZS0+d2F0Y2hDaGFu Z2VzKEljb25DaGFuZ2VDYWxsYmFja0RhdGEoRXdrVmlldzo6aGFuZGxlRmF2aWNvbkNoYW5nZWQs IHRoaXMpKTsKKworICAgIFdLUGFnZVRvRXZhc09iamVjdE1hcDo6QWRkUmVzdWx0IHJlc3VsdCA9 IHdrUGFnZVRvRXZhc09iamVjdE1hcCgpLmFkZCh3a1BhZ2UoKSwgbV9ldmFzT2JqZWN0KTsKKyAg ICBBU1NFUlRfVU5VU0VEKHJlc3VsdCwgcmVzdWx0LmlzTmV3RW50cnkpOwogfQogCiBFd2tWaWV3 Ojp+RXdrVmlldygpCkBAIC0zMDQsNiArMzE1LDkgQEAgRXdrVmlldzo6fkV3a1ZpZXcoKQogICAg IEFTU0VSVChpY29uRGF0YWJhc2UpOwogCiAgICAgaWNvbkRhdGFiYXNlLT51bndhdGNoQ2hhbmdl cyhFd2tWaWV3OjpoYW5kbGVGYXZpY29uQ2hhbmdlZCk7CisKKyAgICBBU1NFUlQod2tQYWdlVG9F dmFzT2JqZWN0TWFwKCkuZ2V0KHdrUGFnZSgpKSA9PSBtX2V2YXNPYmplY3QpOworICAgIHdrUGFn ZVRvRXZhc09iamVjdE1hcCgpLnJlbW92ZSh3a1BhZ2UoKSk7CiB9CiAKIEV2YXNfT2JqZWN0KiBF d2tWaWV3OjpjcmVhdGVFdmFzT2JqZWN0KEV2YXMqIGNhbnZhcywgRXZhc19TbWFydCogc21hcnQs IFBhc3NSZWZQdHI8RXdrQ29udGV4dD4gY29udGV4dCwgUGFzc1JlZlB0cjxFd2tQYWdlR3JvdXA+ IHBhZ2VHcm91cCwgVmlld0JlaGF2aW9yIGJlaGF2aW9yKQpAQCAtMzcwLDEwICszODQsMTAgQEAg Ym9vbCBFd2tWaWV3Ojppbml0U21hcnRDbGFzc0ludGVyZmFjZShFd2tfVmlld19TbWFydF9DbGFz cyYgYXBpKQogICAgIHJldHVybiB0cnVlOwogfQogCi1jb25zdCBFdmFzX09iamVjdCogRXdrVmll dzo6dG9FdmFzT2JqZWN0KFdLUGFnZVJlZiBwYWdlKQorRXZhc19PYmplY3QqIEV3a1ZpZXc6OnRv RXZhc09iamVjdChXS1BhZ2VSZWYgcGFnZSkKIHsKICAgICBBU1NFUlQocGFnZSk7Ci0gICAgcmV0 dXJuIHRvSW1wbChwYWdlKS0+dmlld1dpZGdldCgpOworICAgIHJldHVybiB3a1BhZ2VUb0V2YXNP YmplY3RNYXAoKS5nZXQocGFnZSk7CiB9CiAKIFdLUGFnZVJlZiBFd2tWaWV3Ojp3a1BhZ2UoKSBj b25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmll dy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCmluZGV4IGMz ZGY3NjAuLmFmNzlmNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL0V3a1ZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tW aWV3LmgKQEAgLTExMiw3ICsxMTIsNyBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMgYm9vbCBpbml0 U21hcnRDbGFzc0ludGVyZmFjZShFd2tfVmlld19TbWFydF9DbGFzcyYpOwogCi0gICAgc3RhdGlj IGNvbnN0IEV2YXNfT2JqZWN0KiB0b0V2YXNPYmplY3QoV0tQYWdlUmVmKTsKKyAgICBzdGF0aWMg RXZhc19PYmplY3QqIHRvRXZhc09iamVjdChXS1BhZ2VSZWYpOwogCiAgICAgRXZhc19PYmplY3Qq IGV2YXNPYmplY3QoKSB7IHJldHVybiBtX2V2YXNPYmplY3Q7IH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3RleHRfY2hlY2tlci5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdGV4dF9jaGVja2VyLmNwcAppbmRleCAy YmUyOGM0Li4zODZjYTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfdGV4dF9jaGVja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdGV4dF9jaGVja2VyLmNwcApAQCAtMjksNiArMjksNyBAQAogCiAjaWYgRU5B QkxFKFNQRUxMQ0hFQ0spCiAKKyNpbmNsdWRlICJFd2tWaWV3LmgiCiAjaW5jbHVkZSAiVGV4dENo ZWNrZXJFbmNoYW50LmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCiAjaW5jbHVkZSAiV0tFaW5h U2hhcmVkU3RyaW5nLmgiCkBAIC04NCw3ICs4NSw3IEBAIHN0YXRpYyB2b2lkIHNldENvbnRpbnVv dXNTcGVsbENoZWNraW5nRW5hYmxlZChib29sIGVuYWJsZWQsIGNvbnN0IHZvaWQqKQogc3RhdGlj IHVpbnQ2NF90IHVuaXF1ZVNwZWxsRG9jdW1lbnRUYWcoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZv aWQqKQogewogICAgIGlmIChjbGllbnRDYWxsYmFja3MoKS51bmlxdWVfc3BlbGxfZG9jdW1lbnRf dGFnX2dldCkKLSAgICAgICAgcmV0dXJuIGNsaWVudENhbGxiYWNrcygpLnVuaXF1ZV9zcGVsbF9k b2N1bWVudF90YWdfZ2V0KHRvSW1wbChwYWdlKS0+dmlld1dpZGdldCgpKTsKKyAgICAgICAgcmV0 dXJuIGNsaWVudENhbGxiYWNrcygpLnVuaXF1ZV9zcGVsbF9kb2N1bWVudF90YWdfZ2V0KEV3a1Zp ZXc6OnRvRXZhc09iamVjdChwYWdlKSk7CiAKICAgICByZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA2MGFhOWY2Li4zM2E1YzI1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0xMjQsOCArMTI0LDYgQEAgY2xh c3MgV0tWaWV3OwogCiAjaWYgUExBVEZPUk0oR1RLKQogdHlwZWRlZiBHdGtXaWRnZXQqIFBsYXRm b3JtV2lkZ2V0OwotI2VsaWYgUExBVEZPUk0oRUZMKQotdHlwZWRlZiBFdmFzX09iamVjdCogUGxh dGZvcm1XaWRnZXQ7CiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC00MTksNyArNDE3 LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29tcG9zaXRpb24oY29uc3QgU3RyaW5nJiwgVmVj dG9yPFdlYkNvcmU6OkNvbXBvc2l0aW9uVW5kZXJsaW5lPiYsIGludCk7CiAgICAgdm9pZCBjYW5j ZWxDb21wb3NpdGlvbigpOwogI2VuZGlmCi0jaWYgVVNFKENBSVJPKQorI2lmIFBMQVRGT1JNKEdU SykKICAgICBQbGF0Zm9ybVdpZGdldCB2aWV3V2lkZ2V0KCk7CiAjZW5kaWYKICNpZiBVU0UoVElM RURfQkFDS0lOR19TVE9SRSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9j YWlyby9CYWNraW5nU3RvcmVDYWlyby5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2Fp cm8vQmFja2luZ1N0b3JlQ2Fpcm8uY3BwCmluZGV4IDYxZDBkNDQuLjlkODU4OGIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9jYWlyby9CYWNraW5nU3RvcmVDYWlyby5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NhaXJvL0JhY2tpbmdTdG9yZUNhaXJvLmNw cApAQCAtNTQsNyArNTQsMTEgQEAgdm9pZCBCYWNraW5nU3RvcmU6OnBhaW50KGNhaXJvX3QqIGNv bnRleHQsIGNvbnN0IEludFJlY3QmIHJlY3QpCiB2b2lkIEJhY2tpbmdTdG9yZTo6aW5jb3Jwb3Jh dGVVcGRhdGUoU2hhcmVhYmxlQml0bWFwKiBiaXRtYXAsIGNvbnN0IFVwZGF0ZUluZm8mIHVwZGF0 ZUluZm8pCiB7CiAgICAgaWYgKCFtX2JhY2tpbmdTdG9yZSkKKyNpZiBQTEFURk9STShFRkwpCisg ICAgICAgIG1fYmFja2luZ1N0b3JlID0gV2lkZ2V0QmFja2luZ1N0b3JlOjpjcmVhdGUoRXdrVmll dzo6dG9FdmFzT2JqZWN0KHRvQVBJKG1fd2ViUGFnZVByb3h5KSksIHNpemUoKSk7CisjZWxzZQog ICAgICAgICBtX2JhY2tpbmdTdG9yZSA9IFdpZGdldEJhY2tpbmdTdG9yZTo6Y3JlYXRlKG1fd2Vi UGFnZVByb3h5LT52aWV3V2lkZ2V0KCksIHNpemUoKSk7CisjZW5kaWYKIAogICAgIHNjcm9sbCh1 cGRhdGVJbmZvLnNjcm9sbFJlY3QsIHVwZGF0ZUluZm8uc2Nyb2xsT2Zmc2V0KTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJQYWdlUHJveHlFZmwuY3BwCmluZGV4IDMw MTBlODcuLmE1ZTQ0ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwv V2ViUGFnZVByb3h5RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dl YlBhZ2VQcm94eUVmbC5jcHAKQEAgLTM4LDExICszOCw2IEBACiAKIG5hbWVzcGFjZSBXZWJLaXQg ewogCi1FdmFzX09iamVjdCogV2ViUGFnZVByb3h5Ojp2aWV3V2lkZ2V0KCkKLXsKLSAgICByZXR1 cm4gc3RhdGljX2Nhc3Q8V2ViVmlldyo+KG1fcGFnZUNsaWVudCktPmV2YXNPYmplY3QoKTsKLX0K LQogU3RyaW5nIFdlYlBhZ2VQcm94eTo6c3RhbmRhcmRVc2VyQWdlbnQoY29uc3QgU3RyaW5nJiAv KmFwcGxpY2F0aW9uTmFtZUZvclVzZXJBZ2VudCovKQogewogICAgIFdURjo6U3RyaW5nIHBsYXRm b3JtOwo=