121076 2013-09-09 22:23:37 -0700 Some refinements in FrameView::layout 2013-09-10 00:00:00 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin commit-queue oldest_to_newest 927126 0 darin 2013-09-09 22:23:37 -0700 Some refinements in FrameView::layout 927127 1 211163 darin 2013-09-09 22:26:43 -0700 Created attachment 211163 Patch 927177 2 211163 commit-queue 2013-09-09 23:59:58 -0700 Comment on attachment 211163 Patch Clearing flags on attachment: 211163 Committed r155424: <http://trac.webkit.org/changeset/155424> 927178 3 commit-queue 2013-09-10 00:00:00 -0700 All reviewed patches have been landed. Closing bug. 211163 2013-09-09 22:26:43 -0700 2013-09-09 23:59:58 -0700 Patch bug-121076-20130909222642.patch text/plain 11037 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzY4NjhjZjg5NDkwYThj OWU1NjViNmYzM2NhYmVhZjI0Y2U1Yzk1My4uYWUzMzM0ZDkwYzE3YTRkY2RiNTZiMzdkZTI1YzZm YjZhODg3ZDQxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA5LTA5ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBTb21lIHJlZmluZW1lbnRzIGlu IEZyYW1lVmlldzo6bGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjEwNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l Vmlldzo6bGF5b3V0KTogVXNlIGEgcmVmZXJlbmNlIGZvciB0aGUgZG9jdW1lbnQgaW4KKyAgICAg ICAgdGhpcyBmdW5jdGlvbiBzaW5jZSBjb2RlIGFzc3VtZXMgaXQncyBub24tbnVsbCBhbnl3YXku IENoYW5nZSBjb2RlIHRvCisgICAgICAgIG9ubHkgY2FsbCBzdHlsZVJlc29sdmVySWZFeGlzdHMg b25jZS4gUmV3cml0ZSBjb21tZW50cyBhYm91dCBibG9ja3MKKyAgICAgICAgYW5kIHRoZSBzY29w ZXMgdGhleSBjcmVhdGUgZm9yIGJldHRlciBjbGFyaXR5LiBNYWtlIG1fbmVzdGVkTGF5b3V0Q291 bnQKKyAgICAgICAgZWFzaWVyIHRvIHJlYWQuIFVzZSBIVE1MRWxlbWVudCogZm9yIHRoZSBwb2lu dGVyIHRvIHRoZSBib2R5IGVsZW1lbnQuCisgICAgICAgIE1vdmVkIHRoZSBjYWxsIHRvIGNhbGN1 bGF0ZVNjcm9sbGJhck1vZGVzRm9yTGF5b3V0IGluIHNvIHdlIGRvbid0CisgICAgICAgIHdhc3Rl IHRpbWUgZG9pbmcgaXQgZm9yIHN1YnRyZWUgbGF5b3V0cy4gR2V0IHJpZCBvZiB0aGUgdW5oZWxw ZnVsCisgICAgICAgIGN1cnJlbnRITW9kZSBhbmQgY3VycmVudFZNb2RlIGxvY2FsIHZhcmlhYmxl cy4gR2V0IHJpZCBvZiBhbiBleHRyYQorICAgICAgICBibG9jayBzY29wZSB3ZSBkaWQgbm90IG5l ZWQuCisKIDIwMTMtMDktMDkgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlZi1pZnkgbW9yZSBzdGFjayBndWFyZHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKaW5kZXggODZkODFiM2RkYjRhZWM2ODc3MzgyNzE4N2MyNGU4MWQzYWMzZjQxMy4uZmRiNDk3 OWRiMjk4Y2Y4YWY2MGYyODI0OTgzNDQ3ZTVlOGIwZmY3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcApAQCAtMTEyOSw5ICsxMTI5LDExIEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9v bCBhbGxvd1N1YnRyZWUpCiAgICAgfQogCiAgICAgQVNTRVJUKGZyYW1lKCkudmlldygpID09IHRo aXMpOworICAgIEFTU0VSVChmcmFtZSgpLmRvY3VtZW50KCkpOworCisgICAgRG9jdW1lbnQmIGRv Y3VtZW50ID0gKmZyYW1lKCkuZG9jdW1lbnQoKTsKKyAgICBBU1NFUlQoIWRvY3VtZW50LmluUGFn ZUNhY2hlKCkpOwogCi0gICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gZnJhbWUoKS5kb2N1bWVudCgp OwotICAgIEFTU0VSVCghZG9jdW1lbnQtPmluUGFnZUNhY2hlKCkpOwogICAgIGJvb2wgc3VidHJl ZTsKICAgICBSZW5kZXJPYmplY3QqIHJvb3Q7CiAKQEAgLTExNDcsMTMgKzExNDksMTMgQEAgdm9p ZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkKICAgICAgICAgfQogCiAgICAg ICAgIC8vIFZpZXdwb3J0LWRlcGVuZGVudCBtZWRpYSBxdWVyaWVzIG1heSBjYXVzZSB1cyB0byBu ZWVkIGNvbXBsZXRlbHkgZGlmZmVyZW50IHN0eWxlIGluZm9ybWF0aW9uLgotICAgICAgICBpZiAo IWRvY3VtZW50LT5zdHlsZVJlc29sdmVySWZFeGlzdHMoKSB8fCBkb2N1bWVudC0+c3R5bGVSZXNv bHZlcklmRXhpc3RzKCktPmFmZmVjdGVkQnlWaWV3cG9ydENoYW5nZSgpKSB7Ci0gICAgICAgICAg ICBkb2N1bWVudC0+c3R5bGVSZXNvbHZlckNoYW5nZWQoRGVmZXJSZWNhbGNTdHlsZSk7Ci0gICAg ICAgICAgICAvLyBGSVhNRTogVGhpcyBpbnN0cnVtZW50YXRpb24gZXZlbnQgaXMgbm90IHN0cmlj dGx5IGFjY3VyYXRlIHNpbmNlIGNhY2hlZCBtZWRpYSBxdWVyeSByZXN1bHRzCi0gICAgICAgICAg ICAvLyAgICAgICAgZG8gbm90IHBlcnNpc3QgYWNyb3NzIFN0eWxlUmVzb2x2ZXIgcmVidWlsZHMu Ci0gICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Om1lZGlhUXVlcnlSZXN1bHRD aGFuZ2VkKGRvY3VtZW50KTsKKyAgICAgICAgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlciA9 IGRvY3VtZW50LnN0eWxlUmVzb2x2ZXJJZkV4aXN0cygpOworICAgICAgICBpZiAoIXN0eWxlUmVz b2x2ZXIgfHwgc3R5bGVSZXNvbHZlci0+YWZmZWN0ZWRCeVZpZXdwb3J0Q2hhbmdlKCkpIHsKKyAg ICAgICAgICAgIGRvY3VtZW50LnN0eWxlUmVzb2x2ZXJDaGFuZ2VkKERlZmVyUmVjYWxjU3R5bGUp OworICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgaW5zdHJ1bWVudGF0aW9uIGV2ZW50IGlzIG5v dCBzdHJpY3RseSBhY2N1cmF0ZSBzaW5jZSBjYWNoZWQgbWVkaWEgcXVlcnkgcmVzdWx0cyBkbyBu b3QgcGVyc2lzdCBhY3Jvc3MgU3R5bGVSZXNvbHZlciByZWJ1aWxkcy4KKyAgICAgICAgICAgIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6bWVkaWFRdWVyeVJlc3VsdENoYW5nZWQoJmRvY3VtZW50 KTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBkb2N1bWVudC0+ZXZhbHVhdGVNZWRpYVF1 ZXJ5TGlzdCgpOworICAgICAgICAgICAgZG9jdW1lbnQuZXZhbHVhdGVNZWRpYVF1ZXJ5TGlzdCgp OwogCiAgICAgICAgIC8vIElmIHRoZXJlIGlzIGFueSBwYWdpbmF0aW9uIHRvIGFwcGx5LCBpdCB3 aWxsIGFmZmVjdCB0aGUgUmVuZGVyVmlldydzIHN0eWxlLCBzbyB3ZSBzaG91bGQKICAgICAgICAg Ly8gdGFrZSBjYXJlIG9mIHRoYXQgbm93LgpAQCAtMTE2Miw3ICsxMTY0LDcgQEAgdm9pZCBGcmFt ZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkKICAgICAgICAgLy8gQWx3YXlzIGVuc3Vy ZSBvdXIgc3R5bGUgaW5mbyBpcyB1cC10by1kYXRlLiBUaGlzIGNhbiBoYXBwZW4gaW4gc2l0dWF0 aW9ucyB3aGVyZQogICAgICAgICAvLyB0aGUgbGF5b3V0IGJlYXRzIGFueSBzb3J0IG9mIHN0eWxl IHJlY2FsYyB1cGRhdGUgdGhhdCBuZWVkcyB0byBvY2N1ci4KICAgICAgICAgVGVtcG9yYXJ5Q2hh bmdlPGJvb2w+IGNoYW5nZURvaW5nUHJlTGF5b3V0U3R5bGVVcGRhdGUobV9kb2luZ1ByZUxheW91 dFN0eWxlVXBkYXRlLCB0cnVlKTsKLSAgICAgICAgZG9jdW1lbnQtPnVwZGF0ZVN0eWxlSWZOZWVk ZWQoKTsKKyAgICAgICAgZG9jdW1lbnQudXBkYXRlU3R5bGVJZk5lZWRlZCgpOwogCiAgICAgICAg IHN1YnRyZWUgPSBtX2xheW91dFJvb3Q7CiAKQEAgLTExNzEsMjUgKzExNzMsMjcgQEAgdm9pZCBG cmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkKICAgICAgICAgaWYgKGhhc09uZVJl ZigpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHJvb3QgPSBzdWJ0cmVlID8gbV9s YXlvdXRSb290IDogZG9jdW1lbnQtPnJlbmRlclZpZXcoKTsKKyAgICAgICAgcm9vdCA9IHN1YnRy ZWUgPyBtX2xheW91dFJvb3QgOiBkb2N1bWVudC5yZW5kZXJWaWV3KCk7CiAgICAgICAgIGlmICgh cm9vdCkgewogICAgICAgICAgICAgLy8gRklYTUU6IERvIHdlIG5lZWQgdG8gc2V0IG1fc2l6ZSBo ZXJlPwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgfSAvLyBSZXNldCBtX2xh eW91dFNjaGVkdWxpbmdFbmFibGVkIHRvIGl0cyBwcmV2aW91cyB2YWx1ZS4KLSAgICAvLyBUaGUg b25seSByZWFzb24gdGhlIHNjb3Bpbmcgd2FzIGNsb3NlZCBoZXJlIGlzIGFsbG93IGZvbnRDYWNo ZVB1cmdlUHJldmVudGVyCi0gICAgLy8gdG8gb3V0bGl2ZSB0aGUgY2hhbmdlIGFuZCByZXNldCBv ZiBtX2xheW91dFNjaGVkdWxpbmdFbmFibGVkLgorCisgICAgICAgIC8vIENsb3NlIGJsb2NrIGhl cmUgc28gd2UgY2FuIHNldCB1cCB0aGUgZm9udCBjYWNoZSBwdXJnZSBwcmV2ZW50ZXIsIHdoaWNo IHdlIHdpbGwgc3RpbGwKKyAgICAgICAgLy8gd2FudCBpbiBzY29wZSBldmVuIGFmdGVyIHdlIHdh bnQgbV9sYXlvdXRTY2hlZHVsaW5nRW5hYmxlZCB0byBiZSByZXN0b3JlZCBhZ2Fpbi4KKyAgICAg ICAgLy8gVGhlIG5leHQgYmxvY2sgc2V0cyBtX2xheW91dFNjaGVkdWxpbmdFbmFibGVkIGJhY2sg dG8gZmFsc2Ugb25jZSBhZ2Fpbi4KKyAgICB9CiAKICAgICBGb250Q2FjaGVQdXJnZVByZXZlbnRl ciBmb250Q2FjaGVQdXJnZVByZXZlbnRlcjsKICAgICBSZW5kZXJMYXllciogbGF5ZXI7CisKKyAg ICArK21fbmVzdGVkTGF5b3V0Q291bnQ7CisKICAgICB7CiAgICAgICAgIFRlbXBvcmFyeUNoYW5n ZTxib29sPiBjaGFuZ2VTY2hlZHVsaW5nRW5hYmxlZChtX2xheW91dFNjaGVkdWxpbmdFbmFibGVk LCBmYWxzZSk7CiAKLSAgICAgICAgbV9uZXN0ZWRMYXlvdXRDb3VudCsrOwotCiAgICAgICAgIGlm ICghbV9sYXlvdXRSb290KSB7Ci0gICAgICAgICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBmcmFt ZSgpLmRvY3VtZW50KCk7Ci0gICAgICAgICAgICBOb2RlKiBib2R5ID0gZG9jdW1lbnQtPmJvZHko KTsKKyAgICAgICAgICAgIEhUTUxFbGVtZW50KiBib2R5ID0gZG9jdW1lbnQuYm9keSgpOwogICAg ICAgICAgICAgaWYgKGJvZHkgJiYgYm9keS0+cmVuZGVyZXIoKSkgewogICAgICAgICAgICAgICAg IGlmIChib2R5LT5oYXNUYWdOYW1lKGZyYW1lc2V0VGFnKSAmJiAhZnJhbWVGbGF0dGVuaW5nRW5h YmxlZCgpKSB7CiAgICAgICAgICAgICAgICAgICAgIGJvZHktPnJlbmRlcmVyKCktPnNldENoaWxk TmVlZHNMYXlvdXQodHJ1ZSk7CkBAIC0xMjAxLDI0ICsxMjA1LDIwIEBAIHZvaWQgRnJhbWVWaWV3 OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAKICNpZmRlZiBJTlNUUlVNRU5UX0xBWU9VVF9T Q0hFRFVMSU5HCiAgICAgICAgICAgICBpZiAobV9maXJzdExheW91dCAmJiAhZnJhbWUoKS5vd25l ckVsZW1lbnQoKSkKLSAgICAgICAgICAgICAgICBwcmludGYoIkVsYXBzZWQgdGltZSBiZWZvcmUg Zmlyc3QgbGF5b3V0OiAlZFxuIiwgZG9jdW1lbnQtPmVsYXBzZWRUaW1lKCkpOworICAgICAgICAg ICAgICAgIHByaW50ZigiRWxhcHNlZCB0aW1lIGJlZm9yZSBmaXJzdCBsYXlvdXQ6ICVkXG4iLCBk b2N1bWVudC5lbGFwc2VkVGltZSgpKTsKICNlbmRpZiAgICAgICAgCiAgICAgICAgIH0KIAogICAg ICAgICBhdXRvU2l6ZUlmRW5hYmxlZCgpOwogCi0gICAgICAgIFNjcm9sbGJhck1vZGUgaE1vZGU7 Ci0gICAgICAgIFNjcm9sbGJhck1vZGUgdk1vZGU7ICAgIAotICAgICAgICBjYWxjdWxhdGVTY3Jv bGxiYXJNb2Rlc0ZvckxheW91dChoTW9kZSwgdk1vZGUpOwotCiAgICAgICAgIG1fbmVlZHNGdWxs UmVwYWludCA9ICFzdWJ0cmVlICYmIChtX2ZpcnN0TGF5b3V0IHx8IHRvUmVuZGVyVmlldygqcm9v dCkucHJpbnRpbmcoKSk7CiAKICAgICAgICAgaWYgKCFzdWJ0cmVlKSB7Ci0gICAgICAgICAgICAv LyBOb3cgc2V0IG91ciBzY3JvbGxiYXIgc3RhdGUgZm9yIHRoZSBsYXlvdXQuCi0gICAgICAgICAg ICBTY3JvbGxiYXJNb2RlIGN1cnJlbnRITW9kZSA9IGhvcml6b250YWxTY3JvbGxiYXJNb2RlKCk7 Ci0gICAgICAgICAgICBTY3JvbGxiYXJNb2RlIGN1cnJlbnRWTW9kZSA9IHZlcnRpY2FsU2Nyb2xs YmFyTW9kZSgpOworICAgICAgICAgICAgU2Nyb2xsYmFyTW9kZSBoTW9kZTsKKyAgICAgICAgICAg IFNjcm9sbGJhck1vZGUgdk1vZGU7ICAgIAorICAgICAgICAgICAgY2FsY3VsYXRlU2Nyb2xsYmFy TW9kZXNGb3JMYXlvdXQoaE1vZGUsIHZNb2RlKTsKIAotICAgICAgICAgICAgaWYgKG1fZmlyc3RM YXlvdXQgfHwgKGhNb2RlICE9IGN1cnJlbnRITW9kZSB8fCB2TW9kZSAhPSBjdXJyZW50Vk1vZGUp KSB7CisgICAgICAgICAgICBpZiAobV9maXJzdExheW91dCB8fCAoaE1vZGUgIT0gaG9yaXpvbnRh bFNjcm9sbGJhck1vZGUoKSB8fCB2TW9kZSAhPSB2ZXJ0aWNhbFNjcm9sbGJhck1vZGUoKSkpIHsK ICAgICAgICAgICAgICAgICBpZiAobV9maXJzdExheW91dCkgewogICAgICAgICAgICAgICAgICAg ICBzZXRTY3JvbGxiYXJzU3VwcHJlc3NlZCh0cnVlKTsKIApAQCAtMTI1MCw4ICsxMjUwLDggQEAg dm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkKICAgICAgICAgICAgIGlm IChvbGRTaXplICE9IG1fc2l6ZSkgewogICAgICAgICAgICAgICAgIG1fbmVlZHNGdWxsUmVwYWlu dCA9IHRydWU7CiAgICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0KSB7Ci0gICAgICAg ICAgICAgICAgICAgIFJlbmRlckJveCogcm9vdFJlbmRlcmVyID0gZG9jdW1lbnQtPmRvY3VtZW50 RWxlbWVudCgpID8gZG9jdW1lbnQtPmRvY3VtZW50RWxlbWVudCgpLT5yZW5kZXJCb3goKSA6IDA7 Ci0gICAgICAgICAgICAgICAgICAgIFJlbmRlckJveCogYm9keVJlbmRlcmVyID0gcm9vdFJlbmRl cmVyICYmIGRvY3VtZW50LT5ib2R5KCkgPyBkb2N1bWVudC0+Ym9keSgpLT5yZW5kZXJCb3goKSA6 IDA7CisgICAgICAgICAgICAgICAgICAgIFJlbmRlckJveCogcm9vdFJlbmRlcmVyID0gZG9jdW1l bnQuZG9jdW1lbnRFbGVtZW50KCkgPyBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKS0+cmVuZGVy Qm94KCkgOiAwOworICAgICAgICAgICAgICAgICAgICBSZW5kZXJCb3gqIGJvZHlSZW5kZXJlciA9 IHJvb3RSZW5kZXJlciAmJiBkb2N1bWVudC5ib2R5KCkgPyBkb2N1bWVudC5ib2R5KCktPnJlbmRl ckJveCgpIDogMDsKICAgICAgICAgICAgICAgICAgICAgaWYgKGJvZHlSZW5kZXJlciAmJiBib2R5 UmVuZGVyZXItPnN0cmV0Y2hlc1RvVmlld3BvcnQoKSkKICAgICAgICAgICAgICAgICAgICAgICAg IGJvZHlSZW5kZXJlci0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlKTsKICAgICAgICAgICAgICAg ICAgICAgZWxzZSBpZiAocm9vdFJlbmRlcmVyICYmIHJvb3RSZW5kZXJlci0+c3RyZXRjaGVzVG9W aWV3cG9ydCgpKQpAQCAtMTI2NCwzMSArMTI2NCwzMSBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0 KGJvb2wgYWxsb3dTdWJ0cmVlKQogCiAgICAgICAgIHBhdXNlU2NoZWR1bGVkRXZlbnRzKCk7CiAK LSAgICAgICAgewotICAgICAgICAgICAgYm9vbCBkaXNhYmxlTGF5b3V0U3RhdGUgPSBmYWxzZTsK LSAgICAgICAgICAgIGlmIChzdWJ0cmVlKSB7Ci0gICAgICAgICAgICAgICAgZGlzYWJsZUxheW91 dFN0YXRlID0gcm9vdC0+dmlldygpLnNob3VsZERpc2FibGVMYXlvdXRTdGF0ZUZvclN1YnRyZWUo cm9vdCk7Ci0gICAgICAgICAgICAgICAgcm9vdC0+dmlldygpLnB1c2hMYXlvdXRTdGF0ZShyb290 KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIExheW91dFN0YXRlRGlzYWJsZXIgbGF5b3V0 U3RhdGVEaXNhYmxlcihkaXNhYmxlTGF5b3V0U3RhdGUgPyAmcm9vdC0+dmlldygpIDogMCk7Cisg ICAgICAgIGJvb2wgZGlzYWJsZUxheW91dFN0YXRlID0gZmFsc2U7CisgICAgICAgIGlmIChzdWJ0 cmVlKSB7CisgICAgICAgICAgICBkaXNhYmxlTGF5b3V0U3RhdGUgPSByb290LT52aWV3KCkuc2hv dWxkRGlzYWJsZUxheW91dFN0YXRlRm9yU3VidHJlZShyb290KTsKKyAgICAgICAgICAgIHJvb3Qt PnZpZXcoKS5wdXNoTGF5b3V0U3RhdGUocm9vdCk7CisgICAgICAgIH0KKyAgICAgICAgTGF5b3V0 U3RhdGVEaXNhYmxlciBsYXlvdXRTdGF0ZURpc2FibGVyKGRpc2FibGVMYXlvdXRTdGF0ZSA/ICZy b290LT52aWV3KCkgOiAwKTsKIAotICAgICAgICAgICAgbV9pbkxheW91dCA9IHRydWU7Ci0gICAg ICAgICAgICBiZWdpbkRlZmVycmVkUmVwYWludHMoKTsKLSAgICAgICAgICAgIGZvcmNlTGF5b3V0 UGFyZW50Vmlld0lmTmVlZGVkKCk7Ci0gICAgICAgICAgICByb290LT5sYXlvdXQoKTsKKyAgICAg ICAgbV9pbkxheW91dCA9IHRydWU7CisgICAgICAgIGJlZ2luRGVmZXJyZWRSZXBhaW50cygpOwor ICAgICAgICBmb3JjZUxheW91dFBhcmVudFZpZXdJZk5lZWRlZCgpOworICAgICAgICByb290LT5s YXlvdXQoKTsKICNpZiBFTkFCTEUoVEVYVF9BVVRPU0laSU5HKQotICAgICAgICAgICAgYm9vbCBh dXRvc2l6ZWQgPSBkb2N1bWVudC0+dGV4dEF1dG9zaXplcigpLT5wcm9jZXNzU3VidHJlZShyb290 KTsKLSAgICAgICAgICAgIGlmIChhdXRvc2l6ZWQgJiYgcm9vdC0+bmVlZHNMYXlvdXQoKSkKLSAg ICAgICAgICAgICAgICByb290LT5sYXlvdXQoKTsKKyAgICAgICAgaWYgKGRvY3VtZW50LnRleHRB dXRvc2l6ZXIoKS0+cHJvY2Vzc1N1YnRyZWUocm9vdCkgJiYgcm9vdC0+bmVlZHNMYXlvdXQoKSkK KyAgICAgICAgICAgIHJvb3QtPmxheW91dCgpOwogI2VuZGlmCi0gICAgICAgICAgICBlbmREZWZl cnJlZFJlcGFpbnRzKCk7Ci0gICAgICAgICAgICBtX2luTGF5b3V0ID0gZmFsc2U7CisgICAgICAg IGVuZERlZmVycmVkUmVwYWludHMoKTsKKyAgICAgICAgbV9pbkxheW91dCA9IGZhbHNlOworCisg ICAgICAgIGlmIChzdWJ0cmVlKQorICAgICAgICAgICAgcm9vdC0+dmlldygpLnBvcExheW91dFN0 YXRlKHJvb3QpOwogCi0gICAgICAgICAgICBpZiAoc3VidHJlZSkKLSAgICAgICAgICAgICAgICBy b290LT52aWV3KCkucG9wTGF5b3V0U3RhdGUocm9vdCk7Ci0gICAgICAgIH0KICAgICAgICAgbV9s YXlvdXRSb290ID0gMDsKLSAgICB9IC8vIFJlc2V0IG1fbGF5b3V0U2NoZWR1bGluZ0VuYWJsZWQg dG8gaXRzIHByZXZpb3VzIHZhbHVlLgorCisgICAgICAgIC8vIENsb3NlIGJsb2NrIGhlcmUgdG8g ZW5kIHRoZSBzY29wZSBvZiBjaGFuZ2VTY2hlZHVsaW5nRW5hYmxlZCBhbmQgbGF5b3V0U3RhdGVE aXNhYmxlci4KKyAgICB9CiAKICAgICBib29sIG5lZWRlZEZ1bGxSZXBhaW50ID0gbV9uZWVkc0Z1 bGxSZXBhaW50OwogCkBAIC0xMzE2LDYgKzEzMTYsNyBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0 KGJvb2wgYWxsb3dTdWJ0cmVlKQogICAgIGlmIChBWE9iamVjdENhY2hlKiBjYWNoZSA9IHJvb3Qt PmRvY3VtZW50KCkuZXhpc3RpbmdBWE9iamVjdENhY2hlKCkpCiAgICAgICAgIGNhY2hlLT5wb3N0 Tm90aWZpY2F0aW9uKHJvb3QsIEFYT2JqZWN0Q2FjaGU6OkFYTGF5b3V0Q29tcGxldGUsIHRydWUp OwogI2VuZGlmCisKICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpIHx8IEVOQUJMRShEUkFH R0FCTEVfUkVHSU9OKQogICAgIHVwZGF0ZUFubm90YXRlZFJlZ2lvbnMoKTsKICNlbmRpZgpAQCAt MTMyNCw5ICsxMzI1LDggQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJl ZSkKIAogICAgIHVwZGF0ZUNhbkJsaXRPblNjcm9sbFJlY3Vyc2l2ZWx5KCk7CiAKLSAgICBpZiAo ZG9jdW1lbnQtPmhhc0xpc3RlbmVyVHlwZShEb2N1bWVudDo6T1ZFUkZMT1dDSEFOR0VEX0xJU1RF TkVSKSkKLSAgICAgICAgdXBkYXRlT3ZlcmZsb3dTdGF0dXMobGF5b3V0V2lkdGgoKSA8IGNvbnRl bnRzV2lkdGgoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGF5b3V0SGVpZ2h0KCkg PCBjb250ZW50c0hlaWdodCgpKTsKKyAgICBpZiAoZG9jdW1lbnQuaGFzTGlzdGVuZXJUeXBlKERv Y3VtZW50OjpPVkVSRkxPV0NIQU5HRURfTElTVEVORVIpKQorICAgICAgICB1cGRhdGVPdmVyZmxv d1N0YXR1cyhsYXlvdXRXaWR0aCgpIDwgY29udGVudHNXaWR0aCgpLCBsYXlvdXRIZWlnaHQoKSA8 IGNvbnRlbnRzSGVpZ2h0KCkpOwogCiAgICAgaWYgKG1fcG9zdExheW91dFRhc2tzVGltZXIuaXNB Y3RpdmUoKSkKICAgICAgICAgcmVzdW1lU2NoZWR1bGVkRXZlbnRzKCk7CkBAIC0xMzM3LDEyICsx MzM3LDExIEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAg ICAgICAgICAgICAgICAgIHJlbmRlclZpZXctPnVwZGF0ZVdpZGdldFBvc2l0aW9ucygpOwogICAg ICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICBtX2luU3luY2hyb25vdXNQb3N0TGF5 b3V0ID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAvLyBDYWxscyByZXN1bWVTY2hlZHVsZWRFdmVu dHMoKQotICAgICAgICAgICAgICAgIHBlcmZvcm1Qb3N0TGF5b3V0VGFza3MoKTsKKyAgICAgICAg ICAgICAgICBwZXJmb3JtUG9zdExheW91dFRhc2tzKCk7IC8vIENhbGxzIHJlc3VtZVNjaGVkdWxl ZEV2ZW50cygpLgogICAgICAgICAgICAgICAgIG1faW5TeW5jaHJvbm91c1Bvc3RMYXlvdXQgPSBm YWxzZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgICAgICAKKwogICAgICAgICBpZiAo IW1fcG9zdExheW91dFRhc2tzVGltZXIuaXNBY3RpdmUoKSAmJiAobmVlZHNMYXlvdXQoKSB8fCBt X2luU3luY2hyb25vdXNQb3N0TGF5b3V0IHx8IGluQ2hpbGRGcmFtZUxheW91dFdpdGhGcmFtZUZs YXR0ZW5pbmcpKSB7CiAgICAgICAgICAgICAvLyBJZiB3ZSBuZWVkIGxheW91dCBvciBhcmUgYWxy ZWFkeSBpbiBhIHN5bmNocm9ub3VzIGNhbGwgdG8gcG9zdExheW91dFRhc2tzKCksIAogICAgICAg ICAgICAgLy8gZGVmZXIgd2lkZ2V0IHVwZGF0ZXMgYW5kIGV2ZW50IGRpc3BhdGNoIHVudGlsIGFm dGVyIHdlIHJldHVybi4gcG9zdExheW91dFRhc2tzKCkKQEAgLTEzNTgsNyArMTM1Nyw4IEBAIHZv aWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAKICAgICBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb246OmRpZExheW91dChjb29raWUsIHJvb3QpOwogCi0gICAgbV9uZXN0ZWRM YXlvdXRDb3VudC0tOworICAgIC0tbV9uZXN0ZWRMYXlvdXRDb3VudDsKKwogICAgIGlmIChtX25l c3RlZExheW91dENvdW50KQogICAgICAgICByZXR1cm47CiAK