82289 2012-03-26 19:57:00 -0700 [Qt][WK2] Merge setVisibleContentsRect with setFixedVisibleContentRect 2012-03-27 07:43:08 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yael webkit-unassigned kenneth menard noam webkit.review.bot zoltan oldest_to_newest 588503 0 yael 2012-03-26 19:57:00 -0700 As we scroll, we constantly send 2 messages. Those 2 messages can be merged into one. Patch is coming. 588508 1 133965 yael 2012-03-26 20:01:44 -0700 Created attachment 133965 Patch 588597 2 133965 kenneth 2012-03-26 23:39:36 -0700 Comment on attachment 133965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133965&action=review > Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp:448 > scheduleLayerFlush(); > + if (updateFixedVisibleRect) > + m_webPage->setFixedVisibleContentRect(rect); > } I am just wondering, what is the reason this should not always be updated? in theory the fixed visible rect is just the visisble rect (used together with fixed layouting) 588800 3 yael 2012-03-27 05:30:38 -0700 (In reply to comment #2) > (From update of attachment 133965 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133965&action=review > > > Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp:448 > > scheduleLayerFlush(); > > + if (updateFixedVisibleRect) > > + m_webPage->setFixedVisibleContentRect(rect); > > } > > I am just wondering, what is the reason this should not always be updated? in theory the fixed visible rect is just the visisble rect (used together with fixed layouting) When running with the option --desktop, we don't want to update this. 588806 4 kenneth 2012-03-27 05:43:18 -0700 But you do want to update the other because of AC? Why not just add a isUsingFixedLayout check or so? 588816 5 134042 yael 2012-03-27 06:07:21 -0700 Created attachment 134042 Patch Removed the bool and rely on useFixedLayout() instead. 588876 6 134042 webkit.review.bot 2012-03-27 07:43:03 -0700 Comment on attachment 134042 Patch Clearing flags on attachment: 134042 Committed r112265: <http://trac.webkit.org/changeset/112265> 588877 7 webkit.review.bot 2012-03-27 07:43:08 -0700 All reviewed patches have been landed. Closing bug. 133965 2012-03-26 20:01:44 -0700 2012-03-27 06:07:21 -0700 Patch 82289.patch text/plain 13530 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjE5OCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDEyLTAzLTI2ICBZYWVsIEFo YXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gTWVyZ2Ug c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCB3aXRoIHNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjI4OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHdlIHNjcm9s bCwgd2UgY29uc3RhbnRseSBzZW5kIDIgbWVzc2FnZXMuIFRob3NlIDIgbWVzc2FnZXMgY2FuIGJl IG1lcmdlZCBpbnRvIG9uZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJWaWV3TGVnYWN5UHJpdmF0ZTo6dXBkYXRlVmll d3BvcnRTaXplKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdGbGlja2FibGVQcml2YXRlOjpfcV9j b250ZW50Vmlld3BvcnRDaGFuZ2VkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQ cm94eS5oOgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5OjpzZXRWaXNpYmxlQ29u dGVudHNSZWN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2V0VmlzaWJsZUNvbnRl bnRzUmVjdCk6CisgICAgICAgICogVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmg6Cisg ICAgICAgIChEcmF3aW5nQXJlYVByb3h5SW1wbCk6CisgICAgICAgICogVUlQcm9jZXNzL0xheWVy VHJlZUhvc3RQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RQcm94eTo6 c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCk6CisgICAgICAgICogVUlQcm9jZXNzL0xheWVyVHJlZUhv c3RQcm94eS5oOgorICAgICAgICAoTGF5ZXJUcmVlSG9zdFByb3h5KToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViUGFnZVByb3h5KToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5oOgorICAgICAgICAoV2ViS2l0OjpM YXllclRyZWVIb3N0OjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvTGF5ZXJUcmVlSG9zdC5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TGF5ZXJUcmVl SG9zdFF0OjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvcXQvTGF5ZXJUcmVlSG9zdFF0Lmg6CisgICAgICAgIChMYXllclRyZWVIb3N0UXQpOgor CiAyMDEyLTAzLTI2ICBQcmF0aWsgU29sYW5raSAgPHBzb2xhbmtpQGFwcGxlLmNvbT4KIAogICAg ICAgICBGaXggdHlwbyBpbiBtZXRob2QgbmFtZSAtIFdlYkNvcmU6Om1pbWludW1WYWx1ZUZvckxl bmd0aCBzaG91bGQgYmUgV2ViQ29yZTo6bWluaW11bVZhbHVlRm9yTGVuZ3RoCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgJKHJldmlzaW9uIDExMjEw NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5LmgJKHdvcmtp bmcgY29weSkKQEAgLTkzLDcgKzkzLDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwYWlu dFRvQ3VycmVudEdMQ29udGV4dChjb25zdCBXZWJDb3JlOjpUcmFuc2Zvcm1hdGlvbk1hdHJpeCYs IGZsb2F0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQg cGFpbnRMYXllclRyZWUoQmFja2luZ1N0b3JlOjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCkgeyB9 CiAgICAgTGF5ZXJUcmVlSG9zdFByb3h5KiBsYXllclRyZWVIb3N0UHJveHkoKSBjb25zdCB7IHJl dHVybiBtX2xheWVyVHJlZUhvc3RQcm94eS5nZXQoKTsgfQotICAgIHZpcnR1YWwgdm9pZCBzZXRW aXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpc2libGVDb250ZW50 c1JlY3QsIGZsb2F0IHNjYWxlLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiB0cmFqZWN0b3J5 VmVjdG9yKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25z dCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwgY29u c3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvciwgYm9vbCB1cGRhdGVGaXhl ZFZpc2libGVSZWN0KSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlVGlsZUZvckxheWVyKGlu dCBsYXllcklELCBpbnQgdGlsZUlELCBjb25zdCBXZWJLaXQ6OlVwZGF0ZUluZm8mKSB7IH0KICAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlVGlsZUZvckxheWVyKGludCBsYXllcklELCBpbnQgdGlsZUlE LCBjb25zdCBXZWJLaXQ6OlVwZGF0ZUluZm8mKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgcmVtb3Zl VGlsZUZvckxheWVyKGludCBsYXllcklELCBpbnQgdGlsZUlEKSB7IH0KSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAkocmV2aXNp b24gMTEyMTA0KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJ bXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQ4LDEwICszNDgsMTAgQEAgdm9pZCBEcmF3aW5n QXJlYVByb3h5SW1wbDo6ZGlkUmVjZWl2ZUxheQogICAgICAgICBtX2xheWVyVHJlZUhvc3RQcm94 eS0+ZGlkUmVjZWl2ZUxheWVyVHJlZUhvc3RQcm94eU1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2Fn ZUlELCBhcmd1bWVudHMpOwogfQogCi12b2lkIERyYXdpbmdBcmVhUHJveHlJbXBsOjpzZXRWaXNp YmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpc2libGVDb250ZW50c1Jl Y3QsIGZsb2F0IHNjYWxlLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiB0cmFqZWN0b3J5VmVj dG9yKQordm9pZCBEcmF3aW5nQXJlYVByb3h5SW1wbDo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwg Y29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvciwgYm9vbCB1cGRhdGVG aXhlZFZpc2libGVSZWN0KQogewogICAgIGlmIChtX2xheWVyVHJlZUhvc3RQcm94eSkKLSAgICAg ICAgbV9sYXllclRyZWVIb3N0UHJveHktPnNldFZpc2libGVDb250ZW50c1JlY3QodmlzaWJsZUNv bnRlbnRzUmVjdCwgc2NhbGUsIHRyYWplY3RvcnlWZWN0b3IpOworICAgICAgICBtX2xheWVyVHJl ZUhvc3RQcm94eS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2aXNpYmxlQ29udGVudHNSZWN0LCBz Y2FsZSwgdHJhamVjdG9yeVZlY3RvciwgdXBkYXRlRml4ZWRWaXNpYmxlUmVjdCk7CiB9CiAKIHZv aWQgRHJhd2luZ0FyZWFQcm94eUltcGw6OnBhaW50TGF5ZXJUcmVlKEJhY2tpbmdTdG9yZTo6UGxh dGZvcm1HcmFwaGljc0NvbnRleHQgY29udGV4dCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVByb3h5SW1wbC5oCShyZXZpc2lvbiAxMTIxMDQpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuaAkod29ya2luZyBj b3B5KQpAQCAtNzgsNyArNzgsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNJbkFjY2VsZXJhdGVk Q29tcG9zaXRpbmdNb2RlKCkgY29uc3QgeyByZXR1cm4gIW1fbGF5ZXJUcmVlQ29udGV4dC5pc0Vt cHR5KCk7IH0KIAogI2lmIFVTRShVSV9TSURFX0NPTVBPU0lUSU5HKQotICAgIHZpcnR1YWwgdm9p ZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpc2libGVD b250ZW50c1JlY3QsIGZsb2F0IHNjYWxlLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiB0cmFq ZWN0b3J5KTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JiB2aXNpYmxlQ29udGVudHNSZWN0LCBmbG9hdCBzY2FsZSwgY29uc3Qg V2ViQ29yZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeSwgYm9vbCB1cGRhdGVGaXhlZFZpc2libGVS ZWN0KTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRUb0N1cnJlbnRHTENvbnRleHQoY29uc3QgV2Vi Q29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXgmLCBmbG9hdCBvcGFjaXR5LCBjb25zdCBXZWJDb3Jl OjpGbG9hdFJlY3QmKTsKICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRMYXllclRyZWUoQmFja2luZ1N0 b3JlOjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCk7CiAgICAgdm9pZCBkaWRSZWNlaXZlTGF5ZXJU cmVlSG9zdFByb3h5TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2Fn ZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9MYXllclRyZWVIb3N0UHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9MYXllclRyZWVIb3N0UHJveHkuY3BwCShyZXZpc2lvbiAxMTIxMDQpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF5ZXJUcmVlSG9zdFByb3h5LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTIwLDEwICsxMjAsMTAgQEAgdm9pZCBMYXllclRyZWVIb3N0UHJveHk6OmRl c3Ryb3lEaXJlY3RseQogICAgIGRpc3BhdGNoVXBkYXRlKGJpbmQoJldlYkxheWVyVHJlZVJlbmRl cmVyOjpkZXN0cm95SW1hZ2UsIG1fcmVuZGVyZXIuZ2V0KCksIGtleSkpOwogfQogCi12b2lkIExh eWVyVHJlZUhvc3RQcm94eTo6c2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBJbnRSZWN0JiBy ZWN0LCBmbG9hdCBzY2FsZSwgY29uc3QgRmxvYXRQb2ludCYgdHJhamVjdG9yeVZlY3RvcikKK3Zv aWQgTGF5ZXJUcmVlSG9zdFByb3h5OjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IEludFJl Y3QmIHJlY3QsIGZsb2F0IHNjYWxlLCBjb25zdCBGbG9hdFBvaW50JiB0cmFqZWN0b3J5VmVjdG9y LCBib29sIHVwZGF0ZUZpeGVkVmlzaWJsZVJlY3QpCiB7CiAgICAgbV9yZW5kZXJlci0+c2V0Vmlz aWJsZUNvbnRlbnRzUmVjdChyZWN0LCBzY2FsZSk7Ci0gICAgbV9kcmF3aW5nQXJlYVByb3h5LT5w YWdlKCktPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6TGF5ZXJUcmVlSG9zdDo6U2V0VmlzaWJs ZUNvbnRlbnRzUmVjdChyZWN0LCBzY2FsZSwgdHJhamVjdG9yeVZlY3RvciksIG1fZHJhd2luZ0Fy ZWFQcm94eS0+cGFnZSgpLT5wYWdlSUQoKSk7CisgICAgbV9kcmF3aW5nQXJlYVByb3h5LT5wYWdl KCktPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6TGF5ZXJUcmVlSG9zdDo6U2V0VmlzaWJsZUNv bnRlbnRzUmVjdChyZWN0LCBzY2FsZSwgdHJhamVjdG9yeVZlY3RvciwgdXBkYXRlRml4ZWRWaXNp YmxlUmVjdCksIG1fZHJhd2luZ0FyZWFQcm94eS0+cGFnZSgpLT5wYWdlSUQoKSk7CiB9CiAKIHZv aWQgTGF5ZXJUcmVlSG9zdFByb3h5OjpyZW5kZXJOZXh0RnJhbWUoKQpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0xheWVyVHJlZUhvc3RQcm94eS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXllclRyZWVIb3N0UHJveHkuaAkocmV2aXNpb24gMTEyMTA0 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xheWVyVHJlZUhvc3RQcm94eS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHBhaW50VG9DdXJy ZW50R0xDb250ZXh0KGNvbnN0IFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4JiwgZmxvYXQg b3BhY2l0eSwgY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JiBjbGlwKTsKICAgICB2b2lkIHBhaW50 VG9HcmFwaGljc0NvbnRleHQoQmFja2luZ1N0b3JlOjpQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCk7 CiAgICAgdm9pZCBwdXJnZUdMUmVzb3VyY2VzKCk7Ci0gICAgdm9pZCBzZXRWaXNpYmxlQ29udGVu dHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29y ZTo6RmxvYXRQb2ludCYgdHJhamVjdG9yeSk7CisgICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudHNS ZWN0KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBmbG9hdCBzY2FsZSwgY29uc3QgV2ViQ29yZTo6 RmxvYXRQb2ludCYgdHJhamVjdG9yeSwgYm9vbCB1cGRhdGVGaXhlZFZpc2libGVSZWN0KTsKICAg ICB2b2lkIGRpZFJlbmRlckZyYW1lKCk7CiAgICAgdm9pZCBjcmVhdGVUaWxlRm9yTGF5ZXIoaW50 IGxheWVySUQsIGludCB0aWxlSUQsIGNvbnN0IFdlYktpdDo6VXBkYXRlSW5mbyYpOwogICAgIHZv aWQgdXBkYXRlVGlsZUZvckxheWVyKGludCBsYXllcklELCBpbnQgdGlsZUlELCBjb25zdCBXZWJL aXQ6OlVwZGF0ZUluZm8mKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCShyZXZpc2lvbiAxMTIxMDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODQ0LDE0ICs4NDQsNiBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6ZXhlY3V0ZUVkaXRDb21tYW5kKGNvCiB9CiAgICAgCiAjaWYgVVNFKFRJ TEVEX0JBQ0tJTkdfU1RPUkUpCi12b2lkIFdlYlBhZ2VQcm94eTo6c2V0Rml4ZWRWaXNpYmxlQ29u dGVudFJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKLXsKLSAgICBpZiAoIWlzVmFsaWQoKSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpT ZXRGaXhlZFZpc2libGVDb250ZW50UmVjdChyZWN0KSwgbV9wYWdlSUQpOwotfQotCiB2b2lkIFdl YlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0IEludFNpemUmIHNpemUpCiB7CiAgICAg aWYgKCFpc1ZhbGlkKCkpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5oCShyZXZpc2lvbiAxMTIxMDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM3OCw3ICszNzgsNiBAQCBwdWJsaWM6CiAgICAg UGxhdGZvcm1XaWRnZXQgdmlld1dpZGdldCgpOwogI2VuZGlmCiAjaWYgVVNFKFRJTEVEX0JBQ0tJ TkdfU1RPUkUpCi0gICAgdm9pZCBzZXRGaXhlZFZpc2libGVDb250ZW50UmVjdChjb25zdCBXZWJD b3JlOjpJbnRSZWN0Jik7CiAgICAgdm9pZCBzZXRWaWV3cG9ydFNpemUoY29uc3QgV2ViQ29yZTo6 SW50U2l6ZSYpOwogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXF1aWNrd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAkocmV2aXNpb24gMTEyMTA0KQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTAxLDcgKzUwMSw3IEBAIHZvaWQgUVF1aWNrV2ViVmlld0xlZ2FjeVByaXZhdGU6OnVw ZGF0ZVYKICAgICAvLyB3aGV0aGVyIGl0cyBmaXhlZCBvciBub3QuIFdlIHN0aWxsIG5lZWQgdG8g dGVsbCB0aGUgZHJhd2luZyBhcmVhIHdoaWNoIHBhcnQgb2YgaXQKICAgICAvLyBoYXMgdG8gYmUg cmVuZGVyZWQgb24gdGlsZXMsIGFuZCBpbiBkZXNrdG9wIG1vZGUgaXQncyBhbGwgb2YgaXQuCiAg ICAgd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5zZXRTaXplKHZpZXdwb3J0U2l6ZSwgSW50 U2l6ZSgpKTsKLSAgICB3ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCktPnNldFZpc2libGVDb250 ZW50c1JlY3QoSW50UmVjdChJbnRQb2ludCgpLCB2aWV3cG9ydFNpemUpLCAxLCBGbG9hdFBvaW50 KCkpOworICAgIHdlYlBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKS0+c2V0VmlzaWJsZUNvbnRlbnRz UmVjdChJbnRSZWN0KEludFBvaW50KCksIHZpZXdwb3J0U2l6ZSksIDEsIEZsb2F0UG9pbnQoKSwg ZmFsc2UpOwogfQogCiBRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6UVF1aWNrV2ViVmll d0ZsaWNrYWJsZVByaXZhdGUoUVF1aWNrV2ViVmlldyogdmlld3BvcnQpCkBAIC02NDEsOCArNjQx LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6X3FfYwogICAgIGNvbnN0 IFFSZWN0IHZpc2libGVSZWN0KHZpc2libGVDb250ZW50c1JlY3QoKSk7CiAgICAgZmxvYXQgc2Nh bGUgPSBwYWdlVmlldy0+Y29udGVudHNTY2FsZSgpOwogCi0gICAgZHJhd2luZ0FyZWEtPnNldFZp c2libGVDb250ZW50c1JlY3QodmlzaWJsZVJlY3QsIHNjYWxlLCB0cmFqZWN0b3J5VmVjdG9yKTsK LSAgICB3ZWJQYWdlUHJveHktPnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KHZpc2libGVSZWN0 KTsKKyAgICBkcmF3aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2aXNpYmxlUmVjdCwg c2NhbGUsIHRyYWplY3RvcnlWZWN0b3IsIHRydWUpOwogfQogCiB2b2lkIFFRdWlja1dlYlZpZXdG bGlja2FibGVQcml2YXRlOjpfcV9zdXNwZW5kKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaAkocmV2aXNpb24gMTEyMTA0KQor KysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0xheWVyVHJlZUhvc3QuaAkod29y a2luZyBjb3B5KQpAQCAtODAsNyArODAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHJl c3VtZVJlbmRlcmluZygpIHsgfQogCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCi0gICAg dmlydHVhbCB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVj dCYsIGZsb2F0IHNjYWxlLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JikgeyB9CisgICAgdmly dHVhbCB2b2lkIHNldFZpc2libGVDb250ZW50c1JlY3QoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYs IGZsb2F0IHNjYWxlLCBjb25zdCBXZWJDb3JlOjpGbG9hdFBvaW50JiwgYm9vbCB1cGRhdGVGaXhl ZFZpc2libGVSZWN0KSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVj dEZvckxheWVyKGludCBsYXllcklELCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JikgeyB9CiAgICAg dmlydHVhbCB2b2lkIHJlbmRlck5leHRGcmFtZSgpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBwdXJn ZUJhY2tpbmdTdG9yZXMoKSB7IH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9MYXllclRyZWVIb3N0Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9MYXllclRyZWVIb3N0Lm1lc3NhZ2VzLmluCShyZXZpc2lv biAxMTIxMDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvTGF5ZXJUcmVl SG9zdC5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMjAsNyArMjAsNyBAQAogCiAjaWYg VVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiBtZXNzYWdlcyAtPiBMYXllclRyZWVIb3N0IHsKLSAg ICBTZXRWaXNpYmxlQ29udGVudHNSZWN0KFdlYkNvcmU6OkludFJlY3QgdmlzaWJsZUNvbnRlbnRz UmVjdCwgZmxvYXQgc2NhbGUsIFdlYkNvcmU6OkZsb2F0UG9pbnQgdHJhamVjdG9yeVZlY3Rvcnkp CisgICAgU2V0VmlzaWJsZUNvbnRlbnRzUmVjdChXZWJDb3JlOjpJbnRSZWN0IHZpc2libGVDb250 ZW50c1JlY3QsIGZsb2F0IHNjYWxlLCBXZWJDb3JlOjpGbG9hdFBvaW50IHRyYWplY3RvcnlWZWN0 b3J5LCBib29sIHVwZGF0ZUZpeGVkVmlzaWJsZVJlY3QpCiAgICAgUmVuZGVyTmV4dEZyYW1lKCkK ICAgICBQdXJnZUJhY2tpbmdTdG9yZXMoKQogfQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlzaW9uIDEx MjEwNCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3Nh Z2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNyArMTA1LDYgQEAgbWVzc2FnZXMgLT4gV2Vi UGFnZSB7CiAgICAgUmVzdW1lQWN0aXZlRE9NT2JqZWN0c0FuZEFuaW1hdGlvbnMoKQogCiAjaWYg VVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCi0gICAgU2V0Rml4ZWRWaXNpYmxlQ29udGVudFJlY3Qo V2ViQ29yZTo6SW50UmVjdCByZWN0KQogICAgIFNldFZpZXdwb3J0U2l6ZShXZWJDb3JlOjpJbnRT aXplIHNpemUpCiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL3F0L0xheWVyVHJlZUhvc3RRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhvc3RRdC5jcHAJKHJldmlzaW9uIDExMjEw NCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0 UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjEsNyArNDIxLDcgQEAgV2ViQ29yZTo6SW50UmVj dCBMYXllclRyZWVIb3N0UXQ6OnZpc2libAogICAgIHJldHVybiBtX3Zpc2libGVDb250ZW50c1Jl Y3Q7CiB9CiAKLXZvaWQgTGF5ZXJUcmVlSG9zdFF0OjpzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNv bnN0IEludFJlY3QmIHJlY3QsIGZsb2F0IHNjYWxlLCBjb25zdCBGbG9hdFBvaW50JiB0cmFqZWN0 b3J5VmVjdG9yKQordm9pZCBMYXllclRyZWVIb3N0UXQ6OnNldFZpc2libGVDb250ZW50c1JlY3Qo Y29uc3QgSW50UmVjdCYgcmVjdCwgZmxvYXQgc2NhbGUsIGNvbnN0IEZsb2F0UG9pbnQmIHRyYWpl Y3RvcnlWZWN0b3IsIGJvb2wgdXBkYXRlRml4ZWRWaXNpYmxlUmVjdCkKIHsKICAgICBib29sIGNv bnRlbnRzUmVjdERpZENoYW5nZSA9IHJlY3QgIT0gbV92aXNpYmxlQ29udGVudHNSZWN0OwogICAg IGJvb2wgY29udGVudHNTY2FsZURpZENoYW5nZSA9IHNjYWxlICE9IG1fY29udGVudHNTY2FsZTsK QEAgLTQ0Myw2ICs0NDMsOCBAQCB2b2lkIExheWVyVHJlZUhvc3RRdDo6c2V0VmlzaWJsZUNvbnRl bnRzCiAgICAgfQogCiAgICAgc2NoZWR1bGVMYXllckZsdXNoKCk7CisgICAgaWYgKHVwZGF0ZUZp eGVkVmlzaWJsZVJlY3QpCisgICAgICAgIG1fd2ViUGFnZS0+c2V0Rml4ZWRWaXNpYmxlQ29udGVu dFJlY3QocmVjdCk7CiB9CiAKIHZvaWQgTGF5ZXJUcmVlSG9zdFF0OjpyZW5kZXJOZXh0RnJhbWUo KQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhv c3RRdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9x dC9MYXllclRyZWVIb3N0UXQuaAkocmV2aXNpb24gMTEyMTA0KQorKysgU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xheWVyVHJlZUhvc3RRdC5oCSh3b3JraW5nIGNvcHkpCkBA IC03MCw3ICs3MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcmVuZGVyTmV4dEZyYW1l KCk7CiAgICAgdmlydHVhbCB2b2lkIHB1cmdlQmFja2luZ1N0b3JlcygpOwogICAgIHZpcnR1YWwg Ym9vbCBsYXllclRyZWVUaWxlVXBkYXRlc0FsbG93ZWQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIHZv aWQgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgZmxvYXQg c2NhbGUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0 VmlzaWJsZUNvbnRlbnRzUmVjdChjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiwgZmxvYXQgc2NhbGUs IGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmLCBib29sIHVwZGF0ZUZpeGVkVmlzaWJsZVJlY3Qp OwogICAgIHZpcnR1YWwgdm9pZCBkaWRTeW5jQ29tcG9zaXRpbmdTdGF0ZUZvckxheWVyKGNvbnN0 IFdlYkxheWVySW5mbyYpOwogICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hMYXllcihXZWJDb3JlOjpX ZWJHcmFwaGljc0xheWVyKik7CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaExheWVyKFdlYkNvcmU6 OldlYkdyYXBoaWNzTGF5ZXIqKTsK 134042 2012-03-27 06:07:21 -0700 2012-03-27 07:43:03 -0700 Patch 82289.patch text/plain 3735 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMjI1OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAzLTI3ICBZYWVsIEFo YXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdW1dLMl0gTWVyZ2Ug c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCB3aXRoIHNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjI4OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzIHdlIHNjcm9s bCwgd2UgY29uc3RhbnRseSBzZW5kIDIgbWVzc2FnZXMuIFRob3NlIDIgbWVzc2FnZXMgY2FuIGJl IG1lcmdlZCBpbnRvIG9uZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vi dmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6X3FfY29u dGVudFZpZXdwb3J0Q2hhbmdlZCk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHA6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku aDoKKyAgICAgICAgKFdlYlBhZ2VQcm94eSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UubWVzc2FnZXMuaW46CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL3F0L0xh eWVyVHJlZUhvc3RRdC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxheWVyVHJlZUhvc3RRdDo6c2V0 VmlzaWJsZUNvbnRlbnRzUmVjdCk6CisKIDIwMTItMDMtMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQXSBJbXBsZW1lbnQgbWlzc2lu ZyBtZXRob2RzIGluIENvb2tpZUphclNvdXAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiAxMTIxMDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODQ0LDE0ICs4NDQs NiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZXhlY3V0ZUVkaXRDb21tYW5kKGNvCiB9CiAgICAgCiAj aWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCi12b2lkIFdlYlBhZ2VQcm94eTo6c2V0Rml4ZWRW aXNpYmxlQ29udGVudFJlY3QoY29uc3QgSW50UmVjdCYgcmVjdCkKLXsKLSAgICBpZiAoIWlzVmFs aWQoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpTZXRGaXhlZFZpc2libGVDb250ZW50UmVjdChyZWN0KSwgbV9wYWdlSUQpOwotfQot CiB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0Vmlld3BvcnRTaXplKGNvbnN0IEludFNpemUmIHNpemUp CiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCShyZXZpc2lvbiAxMTIxMDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTM3OCw3ICszNzgsNiBAQCBwdWJs aWM6CiAgICAgUGxhdGZvcm1XaWRnZXQgdmlld1dpZGdldCgpOwogI2VuZGlmCiAjaWYgVVNFKFRJ TEVEX0JBQ0tJTkdfU1RPUkUpCi0gICAgdm9pZCBzZXRGaXhlZFZpc2libGVDb250ZW50UmVjdChj b25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdm9pZCBzZXRWaWV3cG9ydFNpemUoY29uc3Qg V2ViQ29yZTo6SW50U2l6ZSYpOwogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAkocmV2aXNpb24gMTEyMTA0KQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAkod29y a2luZyBjb3B5KQpAQCAtNjQyLDcgKzY0Miw2IEBAIHZvaWQgUVF1aWNrV2ViVmlld0ZsaWNrYWJs ZVByaXZhdGU6Ol9xX2MKICAgICBmbG9hdCBzY2FsZSA9IHBhZ2VWaWV3LT5jb250ZW50c1NjYWxl KCk7CiAKICAgICBkcmF3aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2aXNpYmxlUmVj dCwgc2NhbGUsIHRyYWplY3RvcnlWZWN0b3IpOwotICAgIHdlYlBhZ2VQcm94eS0+c2V0Rml4ZWRW aXNpYmxlQ29udGVudFJlY3QodmlzaWJsZVJlY3QpOwogfQogCiB2b2lkIFFRdWlja1dlYlZpZXdG bGlja2FibGVQcml2YXRlOjpfcV9zdXNwZW5kKCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAx MTIxMDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNz YWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTA1LDcgKzEwNSw2IEBAIG1lc3NhZ2VzIC0+IFdl YlBhZ2UgewogICAgIFJlc3VtZUFjdGl2ZURPTU9iamVjdHNBbmRBbmltYXRpb25zKCkKIAogI2lm IFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQotICAgIFNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0 KFdlYkNvcmU6OkludFJlY3QgcmVjdCkKICAgICBTZXRWaWV3cG9ydFNpemUoV2ViQ29yZTo6SW50 U2l6ZSBzaXplKQogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9xdC9MYXllclRyZWVIb3N0UXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9xdC9MYXllclRyZWVIb3N0UXQuY3BwCShyZXZpc2lvbiAxMTIx MDQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvcXQvTGF5ZXJUcmVlSG9z dFF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQzLDYgKzQ0Myw4IEBAIHZvaWQgTGF5ZXJUcmVl SG9zdFF0OjpzZXRWaXNpYmxlQ29udGVudHMKICAgICB9CiAKICAgICBzY2hlZHVsZUxheWVyRmx1 c2goKTsKKyAgICBpZiAobV93ZWJQYWdlLT51c2VGaXhlZExheW91dCgpKQorICAgICAgICBtX3dl YlBhZ2UtPnNldEZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0KHJlY3QpOwogfQogCiB2b2lkIExheWVy VHJlZUhvc3RRdDo6cmVuZGVyTmV4dEZyYW1lKCkK