131378 2014-04-08 11:55:09 -0700 Remove exposedRect from TileController 2014-04-08 16:36:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned benjamin commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser thorton oldest_to_newest 998684 0 koivisto 2014-04-08 11:55:09 -0700 Having two separate visible rectangles is confusing. We should compute one on higher level. 998719 1 228873 koivisto 2014-04-08 12:50:56 -0700 Created attachment 228873 patch 998741 2 228873 simon.fraser 2014-04-08 13:19:41 -0700 Comment on attachment 228873 patch View in context: https://bugs.webkit.org/attachment.cgi?id=228873&action=review > Source/WebCore/platform/graphics/TiledBacking.h:53 > + virtual void setTiledScrollingIndicatorPosition(const FloatPoint&) = 0; Why doesn't this happen automatically when tiles are updated? Don't we have enough data in TileController to choose a good position? 998742 3 228873 thorton 2014-04-08 13:20:28 -0700 Comment on attachment 228873 patch View in context: https://bugs.webkit.org/attachment.cgi?id=228873&action=review > Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:454 > + for (const auto& layer : m_pageOverlayLayers.values()) > + layer->flushCompositingState(m_scrolledExposedRect); Do we want to flush these right away? Seems like we should just do this at flush time. In any case, I'm upending the overlay code in https://bugs.webkit.org/show_bug.cgi?id=131353 so I will sort it out. 998766 4 koivisto 2014-04-08 13:50:02 -0700 (In reply to comment #2) > (From update of attachment 228873 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=228873&action=review > > > Source/WebCore/platform/graphics/TiledBacking.h:53 > > + virtual void setTiledScrollingIndicatorPosition(const FloatPoint&) = 0; > > Why doesn't this happen automatically when tiles are updated? Don't we have enough data in TileController to choose a good position? I really just punted figuring it out in this patch. 998878 5 thorton 2014-04-08 16:36:55 -0700 http://trac.webkit.org/changeset/166958 228873 2014-04-08 12:50:56 -0700 2014-04-08 13:20:28 -0700 patch exposed-rect-cleanup.patch text/plain 13676 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Njk0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDE0LTA0LTA4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgZXhwb3NlZFJlY3Qg ZnJvbSBUaWxlQ29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMxMzc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSGF2aW5nIHR3byBzZXBhcmF0ZSB2aXNpYmxlIHJlY3RhbmdsZXMgaXMgY29u ZnVzaW5nLiBXZSBzaG91bGQgY29tcHV0ZSBvbmUgb24gaGlnaGVyIGxldmVsLgorCisgICAgICAg ICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzZXRF eHBvc2VkUmVjdCk6CisgICAgICAgIAorICAgICAgICAgICAgUHVzaCBleHBvc2VkIHJlY3QgdG8g dGlsZSBjb250cm9sbGVyIGJ5IGRvaW5nIGEgbGF5ZXIgZmx1c2ggKGxpa2UgdGhlIGNoYW5nZWQg dmlzaWJsZSByZWN0IGlzIG5vcm1hbGx5IHBhc3NlZCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9UaWxlZEJhY2tpbmcuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9t YWMvVGlsZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMv VGlsZUNvbnRyb2xsZXIubW06CisgICAgICAgIAorICAgICAgICAgICAgUmVtb3ZlIGV4cG9zZWRS ZWN0IGFuZCBqdXN0IHVzZSB2aXNpYmxlUmVjdC4KKworICAgICAgICAoV2ViQ29yZTo6VGlsZUNv bnRyb2xsZXI6OlRpbGVDb250cm9sbGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVDb250cm9s bGVyOjpzZXRUaWxlZFNjcm9sbGluZ0luZGljYXRvclBvc2l0aW9uKToKKyAgICAgICAgCisgICAg ICAgICAgICBVcGRhdGUgdGhlIHNjcm9sbGluZyBpbmRpY2F0b3IgcG9zaXRpb24uCisKKyAgICAg ICAgKFdlYkNvcmU6OlRpbGVDb250cm9sbGVyOjp1cGRhdGVUaWxlQ292ZXJhZ2VNYXApOgorICAg ICAgICAoV2ViQ29yZTo6VGlsZUNvbnRyb2xsZXI6OnNldEV4cG9zZWRSZWN0KTogRGVsZXRlZC4K KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUdyaWQuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUdyaWQubW06CisgICAgICAgIChXZWJDb3Jl OjpUaWxlR3JpZDo6dGlsZXNXb3VsZENoYW5nZUZvclZpc2libGVSZWN0KToKKyAgICAgICAgKFdl YkNvcmU6OlRpbGVHcmlkOjpyZXZhbGlkYXRlVGlsZXMpOgorICAgICAgICAoV2ViQ29yZTo6VGls ZUdyaWQ6OnNjYWxlZEV4cG9zZWRSZWN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFj a2luZzo6UmVuZGVyTGF5ZXJCYWNraW5nKToKKyAgICAgICAgCisgICAgICAgICAgICBObyBuZWVk IHRvIHB1c2ggZXhwb3NlZFJlY3QgYW55bW9yZS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21w b3NpdG9yOjpmbHVzaFBlbmRpbmdMYXllckNoYW5nZXMpOgorICAgICAgICAKKyAgICAgICAgICAg IEludGVncmF0ZSBleHBvc2VkIHJlY3QgdG8gdmlzaWJsZSByZWN0IHdoZW4gZmx1c2hpbmcgbGF5 ZXJzLgorCiAyMDE0LTA0LTA3ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAg ICAgICAgIFtXSzJdW2lPU10gQ29uc2VjdXRpdmUgdmlkZW9zIGluIGZ1bGwgc2NyZWVuIGRpc3Bs YXkgb25seSBibGFjawpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24g MTY2ODk1KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MjkwLDE0ICs0MjkwLDE2IEBAIHZvaWQgRnJhbWVWaWV3OjpzZXRFeHBvc2VkUmVj dChGbG9hdFJlY3QKIHsKICAgICBpZiAobV9leHBvc2VkUmVjdCA9PSBleHBvc2VkUmVjdCkKICAg ICAgICAgcmV0dXJuOwotCiAgICAgbV9leHBvc2VkUmVjdCA9IGV4cG9zZWRSZWN0OwogCiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBzdXBwb3J0IGNsaXBwaW5nIHRvIHRoZSBleHBvc2VkIHJlY3Qg Zm9yIHN1YmZyYW1lcyBhcyB3ZWxsLgotICAgIGlmIChtX2ZyYW1lLT5pc01haW5GcmFtZSgpKSB7 Ci0gICAgICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IHRoaXMtPnRpbGVkQmFj a2luZygpKQotICAgICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChleHBvc2Vk UmVjdCk7Ci0gICAgfQorICAgIGlmICghbV9mcmFtZS0+aXNNYWluRnJhbWUoKSkKKyAgICAgICAg cmV0dXJuOworICAgIGlmIChUaWxlZEJhY2tpbmcqIHRpbGVkQmFja2luZyA9IHRoaXMtPnRpbGVk QmFja2luZygpKQorICAgICAgICB0aWxlZEJhY2tpbmctPnNldFRpbGVkU2Nyb2xsaW5nSW5kaWNh dG9yUG9zaXRpb24oZXhwb3NlZFJlY3QubG9jYXRpb24oKSk7CisKKyAgICBpZiAoYXV0byogdmll dyA9IHJlbmRlclZpZXcoKSkKKyAgICAgICAgdmlldy0+Y29tcG9zaXRvcigpLnNjaGVkdWxlTGF5 ZXJGbHVzaChmYWxzZSAvKiBjYW5UaHJvdHRsZSAqLyk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVkQmFja2lu Zy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1RpbGVk QmFja2luZy5oCShyZXZpc2lvbiAxNjY4OTUpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9UaWxlZEJhY2tpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsNyBAQCBw dWJsaWM6CiAgICAgdmlydHVhbCBGbG9hdFJlY3QgdmlzaWJsZVJlY3QoKSBjb25zdCA9IDA7CiAg ICAgdmlydHVhbCBib29sIHRpbGVzV291bGRDaGFuZ2VGb3JWaXNpYmxlUmVjdChjb25zdCBGbG9h dFJlY3QmKSBjb25zdCA9IDA7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0RXhwb3NlZFJlY3QoY29u c3QgRmxvYXRSZWN0JikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRUaWxlZFNjcm9sbGluZ0lu ZGljYXRvclBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmKSA9IDA7CiAKICAgICB2aXJ0dWFsIHZv aWQgcHJlcG9wdWxhdGVSZWN0KGNvbnN0IEZsb2F0UmVjdCYpID0gMDsKIApJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250cm9sbGVyLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDb250 cm9sbGVyLmgJKHJldmlzaW9uIDE2Njg5NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC04OCw3ICs4 OCw2IEBAIHB1YmxpYzoKICAgICBib29sIGlzSW5XaW5kb3coKSBjb25zdCB7IHJldHVybiBtX2lz SW5XaW5kb3c7IH0KIAogICAgIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgY29uc3QgeyByZXR1 cm4gbV9kZXZpY2VTY2FsZUZhY3RvcjsgfQotICAgIEZsb2F0UmVjdCBleHBvc2VkUmVjdCgpIGNv bnN0IHsgcmV0dXJuIG1fZXhwb3NlZFJlY3Q7IH0KIAogICAgIENvbG9yIHRpbGVEZWJ1Z0JvcmRl ckNvbG9yKCkgY29uc3QgeyByZXR1cm4gbV90aWxlRGVidWdCb3JkZXJDb2xvcjsgfQogICAgIGZs b2F0IHRpbGVEZWJ1Z0JvcmRlcldpZHRoKCkgY29uc3QgeyByZXR1cm4gbV90aWxlRGVidWdCb3Jk ZXJXaWR0aDsgfQpAQCAtMTMzLDcgKzEzMiw3IEBAIHByaXZhdGU6CiAgICAgLy8gVGlsZWRCYWNr aW5nIG1lbWJlciBmdW5jdGlvbnMuCiAgICAgdmlydHVhbCB2b2lkIHNldFZpc2libGVSZWN0KGNv bnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCB0aWxlc1dvdWxkQ2hh bmdlRm9yVmlzaWJsZVJlY3QoY29uc3QgRmxvYXRSZWN0JikgY29uc3Qgb3ZlcnJpZGU7Ci0gICAg dmlydHVhbCB2b2lkIHNldEV4cG9zZWRSZWN0KGNvbnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRlOwor ICAgIHZpcnR1YWwgdm9pZCBzZXRUaWxlZFNjcm9sbGluZ0luZGljYXRvclBvc2l0aW9uKGNvbnN0 IEZsb2F0UG9pbnQmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIHZvaWQgcHJlcG9wdWxhdGVSZWN0 KGNvbnN0IEZsb2F0UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzZXRJc0luV2lu ZG93KGJvb2wpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBzZXRUaWxlQ292ZXJhZ2UoVGls ZUNvdmVyYWdlKSBvdmVycmlkZTsKQEAgLTE4NCw3ICsxODMsNyBAQCBwcml2YXRlOgogICAgIElu dFNpemUgbV90aWxlU2l6ZTsKICAgICBGbG9hdFJlY3QgbV92aXNpYmxlUmVjdDsKICAgICBGbG9h dFJlY3QgbV92aXNpYmxlUmVjdEF0TGFzdFJldmFsaWRhdGU7Ci0gICAgRmxvYXRSZWN0IG1fZXhw b3NlZFJlY3Q7IC8vIFRoZSBleHBvc2VkIGFyZWEgb2YgY29udGFpbmluZyBwbGF0Zm9ybSB2aWV3 cy4KKyAgICBGbG9hdFBvaW50IG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JQb3NpdGlvbjsKICAg ICBJbnRSZWN0IG1fYm91bmRzQXRMYXN0UmV2YWxpZGF0ZTsKIAogICAgIFRpbWVyPFRpbGVDb250 cm9sbGVyPiBtX3RpbGVSZXZhbGlkYXRpb25UaW1lcjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNvbnRyb2xsZXIubW0J KHJldmlzaW9uIDE2Njg5NSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh L21hYy9UaWxlQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtNTgsNyArNTgsNiBAQCBU aWxlQ29udHJvbGxlcjo6VGlsZUNvbnRyb2xsZXIoUGxhdGZvcm1DCiAgICAgOiBtX3RpbGVDYWNo ZUxheWVyKHJvb3RQbGF0Zm9ybUxheWVyKQogICAgICwgbV90aWxlR3JpZChzdGQ6Om1ha2VfdW5p cXVlPFRpbGVHcmlkPigqdGhpcykpCiAgICAgLCBtX3RpbGVTaXplKGRlZmF1bHRUaWxlV2lkdGgs IGRlZmF1bHRUaWxlSGVpZ2h0KQotICAgICwgbV9leHBvc2VkUmVjdChGbG9hdFJlY3Q6OmluZmlu aXRlUmVjdCgpKQogICAgICwgbV90aWxlUmV2YWxpZGF0aW9uVGltZXIodGhpcywgJlRpbGVDb250 cm9sbGVyOjp0aWxlUmV2YWxpZGF0aW9uVGltZXJGaXJlZCkKICAgICAsIG1fY29udGVudHNTY2Fs ZSgxKQogICAgICwgbV9kZXZpY2VTY2FsZUZhY3RvcigxKQpAQCAtMjEzLDEzICsyMTIsMTIgQEAg Ym9vbCBUaWxlQ29udHJvbGxlcjo6dGlsZXNXb3VsZENoYW5nZUZvcgogICAgIHJldHVybiB0aWxl R3JpZCgpLnRpbGVzV291bGRDaGFuZ2VGb3JWaXNpYmxlUmVjdChuZXdWaXNpYmxlUmVjdCwgbV92 aXNpYmxlUmVjdCk7CiB9CiAKLXZvaWQgVGlsZUNvbnRyb2xsZXI6OnNldEV4cG9zZWRSZWN0KGNv bnN0IEZsb2F0UmVjdCYgZXhwb3NlZFJlY3QpCit2b2lkIFRpbGVDb250cm9sbGVyOjpzZXRUaWxl ZFNjcm9sbGluZ0luZGljYXRvclBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIHBvc2l0aW9uKQog ewotICAgIGlmIChtX2V4cG9zZWRSZWN0ID09IGV4cG9zZWRSZWN0KQorICAgIGlmIChtX3RpbGVk U2Nyb2xsaW5nSW5kaWNhdG9yUG9zaXRpb24gPT0gcG9zaXRpb24pCiAgICAgICAgIHJldHVybjsK LQotICAgIG1fZXhwb3NlZFJlY3QgPSBleHBvc2VkUmVjdDsKLSAgICBzZXROZWVkc1JldmFsaWRh dGVUaWxlcygpOworICAgIG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JQb3NpdGlvbiA9IHBvc2l0 aW9uOworICAgIHVwZGF0ZVRpbGVDb3ZlcmFnZU1hcCgpOwogfQogCiB2b2lkIFRpbGVDb250cm9s bGVyOjpwcmVwb3B1bGF0ZVJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQpAQCAtNDE4LDggKzQx Niw2IEBAIHZvaWQgVGlsZUNvbnRyb2xsZXI6OnVwZGF0ZVRpbGVDb3ZlcmFnZU0KICAgICAgICAg cmV0dXJuOwogICAgIEZsb2F0UmVjdCBjb250YWluZXJCb3VuZHMgPSBib3VuZHMoKTsKICAgICBG bG9hdFJlY3QgdmlzaWJsZVJlY3QgPSB0aGlzLT52aXNpYmxlUmVjdCgpOwotCi0gICAgdmlzaWJs ZVJlY3QuaW50ZXJzZWN0KHRpbGVHcmlkKCkuc2NhbGVkRXhwb3NlZFJlY3QoKSk7CiAgICAgdmlz aWJsZVJlY3QuY29udHJhY3QoNCwgNCk7IC8vIExheWVyIGlzIHBvc2l0aW9uZWQgMnB4IGZyb20g dG9wIGFuZCBsZWZ0IGVkZ2VzLgogCiAgICAgZmxvYXQgd2lkdGhTY2FsZSA9IDE7CkBAIC00MzMs MTEgKzQyOSw3IEBAIHZvaWQgVGlsZUNvbnRyb2xsZXI6OnVwZGF0ZVRpbGVDb3ZlcmFnZU0KICAg ICBGbG9hdFJlY3QgbWFwQm91bmRzID0gY29udGFpbmVyQm91bmRzOwogICAgIG1hcEJvdW5kcy5z Y2FsZShpbmRpY2F0b3JTY2FsZSwgaW5kaWNhdG9yU2NhbGUpOwogCi0gICAgaWYgKCFtX2V4cG9z ZWRSZWN0LmlzSW5maW5pdGUoKSkKLSAgICAgICAgbV90aWxlZFNjcm9sbGluZ0luZGljYXRvckxh eWVyLT5zZXRQb3NpdGlvbihtX2V4cG9zZWRSZWN0LmxvY2F0aW9uKCkgKyBGbG9hdFBvaW50KDIs IDIpKTsKLSAgICBlbHNlCi0gICAgICAgIG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JMYXllci0+ c2V0UG9zaXRpb24oRmxvYXRQb2ludCgyLCAyKSk7Ci0KKyAgICBtX3RpbGVkU2Nyb2xsaW5nSW5k aWNhdG9yTGF5ZXItPnNldFBvc2l0aW9uKG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JQb3NpdGlv biArIEZsb2F0UG9pbnQoMiwgMikpOwogICAgIG1fdGlsZWRTY3JvbGxpbmdJbmRpY2F0b3JMYXll ci0+c2V0Qm91bmRzKG1hcEJvdW5kcyk7CiAgICAgbV90aWxlZFNjcm9sbGluZ0luZGljYXRvckxh eWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1RpbGVHcmlkLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVHcmlkLmgJKHJldmlzaW9uIDE2Njg5NSkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlR3JpZC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC02MSw4ICs2MSw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHJldmFsaWRhdGVU aWxlcyhUaWxlVmFsaWRhdGlvblBvbGljeUZsYWdzKTsKICAgICBib29sIHRpbGVzV291bGRDaGFu Z2VGb3JWaXNpYmxlUmVjdChjb25zdCBGbG9hdFJlY3QmIG5ld1Zpc2libGVSZWN0LCBjb25zdCBG bG9hdFJlY3QmIG9sZFZpc2libGVSZWN0KSBjb25zdDsKIAotICAgIEZsb2F0UmVjdCBzY2FsZWRF eHBvc2VkUmVjdCgpIGNvbnN0OwotCiAgICAgSW50UmVjdCB0aWxlQ292ZXJhZ2VSZWN0KCkgY29u c3Q7CiAgICAgSW50UmVjdCBleHRlbnQoKSBjb25zdDsKIApJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVHcmlkLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlR3JpZC5tbQkocmV2aXNpb24g MTY2ODk1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVH cmlkLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNjYsNyArMTY2LDYgQEAgdm9pZCBUaWxlR3JpZDo6 dXBkYXRlVGlsZXJMYXllclByb3BlcnRpZQogYm9vbCBUaWxlR3JpZDo6dGlsZXNXb3VsZENoYW5n ZUZvclZpc2libGVSZWN0KGNvbnN0IEZsb2F0UmVjdCYgbmV3VmlzaWJsZVJlY3QsIGNvbnN0IEZs b2F0UmVjdCYgb2xkVmlzaWJsZVJlY3QpIGNvbnN0CiB7CiAgICAgRmxvYXRSZWN0IHZpc2libGVS ZWN0ID0gbmV3VmlzaWJsZVJlY3Q7Ci0gICAgdmlzaWJsZVJlY3QuaW50ZXJzZWN0KHNjYWxlZEV4 cG9zZWRSZWN0KCkpOwogCiAgICAgaWYgKHZpc2libGVSZWN0LmlzRW1wdHkoKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwpAQCAtMTg1LDEzICsxODQsNiBAQCBib29sIFRpbGVHcmlkOjp0aWxlc1dv dWxkQ2hhbmdlRm9yVmlzaWJsCiAgICAgcmV0dXJuIGNvdmVyYWdlUmVjdCAhPSBtX3ByaW1hcnlU aWxlQ292ZXJhZ2VSZWN0OwogfQogCi1GbG9hdFJlY3QgVGlsZUdyaWQ6OnNjYWxlZEV4cG9zZWRS ZWN0KCkgY29uc3QKLXsKLSAgICBGbG9hdFJlY3Qgc2NhbGVkRXhwb3NlZFJlY3QgPSBtX2NvbnRy b2xsZXIuZXhwb3NlZFJlY3QoKTsKLSAgICBzY2FsZWRFeHBvc2VkUmVjdC5zY2FsZSgxIC8gbV9z Y2FsZSk7Ci0gICAgcmV0dXJuIHNjYWxlZEV4cG9zZWRSZWN0OwotfQotCiBib29sIFRpbGVHcmlk OjpwcmVwb3B1bGF0ZVJlY3QoY29uc3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIEZsb2F0UmVj dCBzY2FsZWRSZWN0KHJlY3QpOwpAQCAtMzQxLDggKzMzMyw2IEBAIHZvaWQgVGlsZUdyaWQ6OnJl dmFsaWRhdGVUaWxlcyhUaWxlVmFsaWQKICAgICBGbG9hdFJlY3QgdmlzaWJsZVJlY3QgPSBtX2Nv bnRyb2xsZXIudmlzaWJsZVJlY3QoKTsKICAgICBJbnRSZWN0IGJvdW5kcyA9IG1fY29udHJvbGxl ci5ib3VuZHMoKTsKIAotICAgIHZpc2libGVSZWN0LmludGVyc2VjdChzY2FsZWRFeHBvc2VkUmVj dCgpKTsKLQogICAgIGlmICh2aXNpYmxlUmVjdC5pc0VtcHR5KCkgfHwgYm91bmRzLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAkocmV2aXNpb24gMTY2ODk1KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEzNiwxMCArMTM2LDggQEAgUmVuZGVyTGF5ZXJCYWNraW5nOjpSZW5kZXJMYXllckJhY2tpbmco UgogCiAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0SXNJbldpbmRvdyhwYWdlLT5pc0luV2luZG93 KCkpOwogCi0gICAgICAgIGlmIChtX2lzTWFpbkZyYW1lUmVuZGVyVmlld0xheWVyKSB7Ci0gICAg ICAgICAgICB0aWxlZEJhY2tpbmctPnNldEV4cG9zZWRSZWN0KHJlbmRlcmVyKCkuZnJhbWUoKS52 aWV3KCktPmV4cG9zZWRSZWN0KCkpOworICAgICAgICBpZiAobV9pc01haW5GcmFtZVJlbmRlclZp ZXdMYXllcikKICAgICAgICAgICAgIHRpbGVkQmFja2luZy0+c2V0VW5wYXJlbnRzT2Zmc2NyZWVu VGlsZXModHJ1ZSk7Ci0gICAgICAgIH0KIAogICAgICAgICB0aWxlZEJhY2tpbmctPnNldFNjcm9s bGluZ1BlcmZvcm1hbmNlTG9nZ2luZ0VuYWJsZWQocGFnZS0+c2V0dGluZ3MoKS5zY3JvbGxpbmdQ ZXJmb3JtYW5jZUxvZ2dpbmdFbmFibGVkKCkpOwogICAgICAgICBhZGp1c3RUaWxlZEJhY2tpbmdD b3ZlcmFnZSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29t cG9zaXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyQ29tcG9zaXRvci5jcHAJKHJldmlzaW9uIDE2Njg5NSkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00 MzIsNyArNDMyLDggQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZsdXNoUGVuZGluZwog ICAgICAgICByb290TGF5ZXItPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZShmcmFtZVZpZXcuY29tcHV0 ZUNvdmVyYWdlUmVjdChob3Jpem9udGFsTWFyZ2luLCB2ZXJ0aWNhbE1hcmdpbikpOwogI2Vsc2UK ICAgICAgICAgLy8gSGF2aW5nIGEgbV9jbGlwTGF5ZXIgaW5kaWNhdGVzIHRoYXQgd2UncmUgZG9p bmcgc2Nyb2xsaW5nIHZpYSBHcmFwaGljc0xheWVycy4KLSAgICAgICAgSW50UmVjdCB2aXNpYmxl UmVjdCA9IG1fY2xpcExheWVyID8gSW50UmVjdChJbnRQb2ludCgpLCBmcmFtZVZpZXcuY29udGVu dHNTaXplKCkpIDogZnJhbWVWaWV3LnZpc2libGVDb250ZW50UmVjdCgpOworICAgICAgICBGbG9h dFJlY3QgdmlzaWJsZVJlY3QgPSBtX2NsaXBMYXllciA/IEZsb2F0UmVjdChGbG9hdFBvaW50KCks IGZyYW1lVmlldy5jb250ZW50c1NpemUoKSkgOiBmcmFtZVZpZXcudmlzaWJsZUNvbnRlbnRSZWN0 KCk7CisgICAgICAgIHZpc2libGVSZWN0LmludGVyc2VjdChmcmFtZVZpZXcuZXhwb3NlZFJlY3Qo KSk7CiAgICAgICAgIHJvb3RMYXllci0+Zmx1c2hDb21wb3NpdGluZ1N0YXRlKHZpc2libGVSZWN0 KTsKICNlbmRpZgogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Njk0MCkKKysrIFNv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisy MDE0LTA0LTA4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW1vdmUgZXhwb3NlZFJlY3QgZnJvbSBUaWxlQ29udHJvbGxlcgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMxMzc4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Jl bW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXll clRyZWVEcmF3aW5nQXJlYTo6dXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCk6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbToK KyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZVNj cm9sbGVkRXhwb3NlZFJlY3QpOgorICAgICAgICAKKyAgICAgICAgICAgIFVwZGF0ZSB0aGUgdmlz aWJsZSByZWN0IGZvciBwYWdlT3ZlcmxheUxheWVycyBieSBjYWxsaW5nIGZsdXNoQ29tcG9zaXRp bmdTdGF0ZS4gVGhpcyB3YXkKKyAgICAgICAgICAgIHRpbGUgY29udHJvbGxlciB2aXNpYmxlIHJl Y3QgdXBkYXRlcyBhbHdheXMgaGFwcGVucyB2aWEgY29tcG9zaXRpbmcgZmx1c2ggKHdlIGFzc2Vy dAorICAgICAgICAgICAgZm9yIHRoaXMgaW4gVGlsZUNvbnRyb2xsZXI6OnNldFZpc2libGVSZWN0 KS4KKwogMjAxNC0wNC0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTWFjXVtXSzJdIFZpZGVvcyBkbyBub3QgaGF2ZSBhY2Nlc3MgdG8gc2Vzc2lvbiBjb29r aWVzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1JlbW90ZUxh eWVyVHJlZURyYXdpbmdBcmVhLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0JKHJldmlzaW9u IDE2Njg5NSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvUmVtb3Rl TGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4NCwxMSArMjg0LDkg QEAgdm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6dXBkYXRlUwogCiAgICAgZnJhbWVW aWV3LT5zZXRFeHBvc2VkUmVjdChtX3Njcm9sbGVkRXhwb3NlZFJlY3QpOwogCi0gICAgZm9yIChj b25zdCBhdXRvJiBsYXllciA6IG1fcGFnZU92ZXJsYXlMYXllcnMudmFsdWVzKCkpIHsKLSAgICAg ICAgaWYgKFRpbGVkQmFja2luZyogdGlsZWRCYWNraW5nID0gbGF5ZXItPnRpbGVkQmFja2luZygp KQotICAgICAgICAgICAgdGlsZWRCYWNraW5nLT5zZXRFeHBvc2VkUmVjdChtX3Njcm9sbGVkRXhw b3NlZFJlY3QpOwotICAgIH0KLSAgICAKKyAgICBmb3IgKGNvbnN0IGF1dG8mIGxheWVyIDogbV9w YWdlT3ZlcmxheUxheWVycy52YWx1ZXMoKSkKKyAgICAgICAgbGF5ZXItPmZsdXNoQ29tcG9zaXRp bmdTdGF0ZShtX3Njcm9sbGVkRXhwb3NlZFJlY3QpOworCiAgICAgZnJhbWVWaWV3LT5hZGp1c3RU aWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWEubW0JKHJldmlzaW9uIDE2Njg5NSkKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0J KHdvcmtpbmcgY29weSkKQEAgLTQ1MCwxMCArNDUwLDggQEAgdm9pZCBUaWxlZENvcmVBbmltYXRp b25EcmF3aW5nQXJlYTo6dXBkYQogCiAgICAgZnJhbWVWaWV3LT5zZXRFeHBvc2VkUmVjdChtX3Nj cm9sbGVkRXhwb3NlZFJlY3QpOwogCi0gICAgZm9yIChjb25zdCBhdXRvJiBsYXllciA6IG1fcGFn ZU92ZXJsYXlMYXllcnMudmFsdWVzKCkpIHsKLSAgICAgICAgaWYgKFRpbGVkQmFja2luZyogdGls ZWRCYWNraW5nID0gbGF5ZXItPnRpbGVkQmFja2luZygpKQotICAgICAgICAgICAgdGlsZWRCYWNr aW5nLT5zZXRFeHBvc2VkUmVjdChtX3Njcm9sbGVkRXhwb3NlZFJlY3QpOwotICAgIH0KKyAgICBm b3IgKGNvbnN0IGF1dG8mIGxheWVyIDogbV9wYWdlT3ZlcmxheUxheWVycy52YWx1ZXMoKSkKKyAg ICAgICAgbGF5ZXItPmZsdXNoQ29tcG9zaXRpbmdTdGF0ZShtX3Njcm9sbGVkRXhwb3NlZFJlY3Qp OwogCiAgICAgZnJhbWVWaWV3LT5hZGp1c3RUaWxlZEJhY2tpbmdDb3ZlcmFnZSgpOwogfQo=