98186 2012-10-02 12:14:26 -0700 [WK2] PageViewportController.cpp is supposed to be a generic WebKit2 file but only works with Qt port. 2012-10-03 14:52:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified All RESOLVED FIXED P2 Normal --- 1 hugo.lima hugo.lima abecsi cmarcelo kenneth menard noam vestbo webkit.review.bot zoltan oldest_to_newest 732929 0 hugo.lima 2012-10-02 12:14:26 -0700 The file is located at Source/WebKit2/UIProcess, it shouldn't depend on Qt but currently it only compiles based on a implicit conversion from WebCore::FloatSize to QSize (because QSize have operator/(float)). The fix just add a operator/(float) to WebCore::FloatSize and remove the implicit conversion from WebCore::FloatSize to QSize. I don't know if WebKit have some rule against operator overloads with operands of different types, so make me know about and if so, I can update the patch to fix PageViewportController.cpp, but IMO adding the operator/ on WebCore::FloatSize seems nicer. 732937 1 166730 hugo.lima 2012-10-02 12:20:02 -0700 Created attachment 166730 Patch 733089 2 166730 noam 2012-10-02 14:39:46 -0700 Comment on attachment 166730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166730&action=review Better to use FloatSize::scale explicitly > Source/WebCore/platform/graphics/FloatSize.h:188 > +inline FloatSize operator/(const FloatSize& a, const float& b) const float& -> float 733097 3 hugo.lima 2012-10-02 14:47:56 -0700 (In reply to comment #2) > (From update of attachment 166730 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=166730&action=review > > Better to use FloatSize::scale explicitly Ok, I'll do that. > > Source/WebCore/platform/graphics/FloatSize.h:188 > > +inline FloatSize operator/(const FloatSize& a, const float& b) > > const float& -> float So, if I'm goin to use FloatSize::scale, operator/ will disappear from this patch. 733872 4 166927 hugo.lima 2012-10-03 11:23:30 -0700 Created attachment 166927 Patch 733980 5 166927 noam 2012-10-03 13:21:17 -0700 Comment on attachment 166927 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166927&action=review > Source/WebCore/platform/graphics/FloatSize.h:100 > + FloatSize scaledTo(float s) const how about scaledSize > Source/WebKit2/UIProcess/PageViewportController.cpp:148 > + if (FloatRect(clampedPos, m_viewportSize.scaledTo(1 / m_effectiveScale)).intersects(coveredRect)) { You're making the same calculation over and over... how about creating a function PageViewportController::viewportSizeInContentsCoordinates that would return that calculation? That way you also don't need a function... 733984 6 hugo.lima 2012-10-03 13:26:29 -0700 (In reply to comment #5) > (From update of attachment 166927 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=166927&action=review > > > Source/WebCore/platform/graphics/FloatSize.h:100 > > + FloatSize scaledTo(float s) const > > how about scaledSize I used scaledTo to follow the same convention used in this file, like "expandedTo" instead of "expandedSize" > > Source/WebKit2/UIProcess/PageViewportController.cpp:148 > > + if (FloatRect(clampedPos, m_viewportSize.scaledTo(1 / m_effectiveScale)).intersects(coveredRect)) { > > You're making the same calculation over and over... how about creating a function PageViewportController::viewportSizeInContentsCoordinates that would return that calculation? That way you also don't need a function... Could be, it's used 3 times, I'll update the patch. 733999 7 166953 hugo.lima 2012-10-03 13:42:07 -0700 Created attachment 166953 Patch 734058 8 166953 webkit.review.bot 2012-10-03 14:52:09 -0700 Comment on attachment 166953 Patch Clearing flags on attachment: 166953 Committed r130327: <http://trac.webkit.org/changeset/130327> 734059 9 webkit.review.bot 2012-10-03 14:52:13 -0700 All reviewed patches have been landed. Closing bug. 166730 2012-10-02 12:20:02 -0700 2012-10-03 11:23:25 -0700 Patch bug-98186-20121002161901.patch text/plain 5033 hugo.lima U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzJkY2RkMjM1NDZlMWQ4 YTIwZDY5NWFmNWFlMzZjMmJiZDVkNTZjYy4uY2YzMzAwNjNiMmVmYTc3M2Q2ZDJkN2Q4ZjNmZWNk ZGUxNTZmNTNkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEwLTAyICBIdWdv IFBhcmVudGUgTGltYSAgPGh1Z28ubGltYUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtXSzJd IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwIGlzIHN1cHBvc2VkIHRvIGJlIGEgZ2VuZXJpYyBX ZWJLaXQyIGZpbGUgYnV0IG9ubHkgd29ya3Mgd2l0aCBRdCBwb3J0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgxODYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgb3BlcmF0b3IvKGZsb2F0KSB0byBG bG9hdFNpemUgdG8gbWFrZSBQYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcCBjb21waWxlIGFuZAor ICAgICAgICByZW1vdmUgdGhlIGltcGxpY2l0IGNvbnZlcnNpb24gZnJvbSBGbG9hdFNpemUgdG8g UVNpemVGLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhlIGFkZGVkIGNvZGUgaXMgdHJpdmlh bCwgbXVjaCBtb3JlIGxpa2UgYSBidWlsZCBmaXguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9GbG9hdFNpemUuaDoKKyAgICAgICAgKEZsb2F0U2l6ZSk6CisgICAgICAgIChXZWJDb3Jl OjpvcGVyYXRvci8pOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMTAtMDIgIE9qYW4gVmFm YWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91 dCByMTMwMTAzIGFuZCByMTMwMTI1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDIzNTZiMGZjNWJlZWM3MzNiYjQ3 ZDI4YTZmYWQ0ZjM0M2RmODI2OTEuLjlmYjY5YzNiNWFmNzlmYjUxNDVkYzljODJiNmVmNDgxYTk2 YjcxNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxMi0xMC0wMiAgSHVnbyBQYXJl bnRlIExpbWEgIDxodWdvLmxpbWFAb3BlbmJvc3NhLm9yZz4KIAorICAgICAgICBbV0syXSBQYWdl Vmlld3BvcnRDb250cm9sbGVyLmNwcCBpcyBzdXBwb3NlZCB0byBiZSBhIGdlbmVyaWMgV2ViS2l0 MiBmaWxlIGJ1dCBvbmx5IHdvcmtzIHdpdGggUXQgcG9ydC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MTg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVpbGQgZml4IGFmdGVyIHRoZSByZW1vdmFsIG9m IGltcGxpY2l0IGNvbnZlcnNpb24gZnJvbSBXZWJDb3JlOjpGbG9hdFNpemUgdG8gUVNpemVGLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcDoKKyAgICAgICAg KFFRdWlja1dlYlBhZ2VQcml2YXRlOjp1cGRhdGVTaXplKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1aWNrV2ViVmlld0xlZ2FjeVBy aXZhdGU6OnVwZGF0ZVZpZXdwb3J0U2l6ZSk6CisgICAgICAgIChRUXVpY2tXZWJWaWV3RmxpY2th YmxlUHJpdmF0ZTo6dXBkYXRlVmlld3BvcnRTaXplKToKKworMjAxMi0xMC0wMiAgSHVnbyBQYXJl bnRlIExpbWEgIDxodWdvLmxpbWFAb3BlbmJvc3NhLm9yZz4KKwogICAgICAgICBbV0syXSBQYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50LmggdXNlcyBXZWJDb3JlIGNsYXNzIHdpdGhvdXQgZGVj bGFyaW5nIHRoZW0KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk4MDcwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0Zsb2F0U2l6ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRTaXpl LmgKaW5kZXggYzAyOWM1YTk1MTgyMjAwZDUwYmVmZDcyMzFkNDNlYmE0NTc1MzI1NS4uZjBlZTcw MGM2OTUyYTIyZmYwYTJlNTJiOTE1M2YwZGYyMjdlYmRiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRTaXplLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRTaXplLmgKQEAgLTEyMSw3ICsxMjEsNyBAQCBwdWJsaWM6 CiAgICAgfQogCiAjaWYgUExBVEZPUk0oUVQpCi0gICAgRmxvYXRTaXplKGNvbnN0IFFTaXplRiYp OworICAgIGV4cGxpY2l0IEZsb2F0U2l6ZShjb25zdCBRU2l6ZUYmKTsKICAgICBvcGVyYXRvciBR U2l6ZUYoKSBjb25zdDsKICNlbmRpZgogCkBAIC0xODUsNiArMTg1LDExIEBAIGlubGluZSBib29s IG9wZXJhdG9yIT0oY29uc3QgRmxvYXRTaXplJiBhLCBjb25zdCBGbG9hdFNpemUmIGIpCiAgICAg cmV0dXJuIGEud2lkdGgoKSAhPSBiLndpZHRoKCkgfHwgYS5oZWlnaHQoKSAhPSBiLmhlaWdodCgp OwogfQogCitpbmxpbmUgRmxvYXRTaXplIG9wZXJhdG9yLyhjb25zdCBGbG9hdFNpemUmIGEsIGNv bnN0IGZsb2F0JiBiKQoreworICAgIHJldHVybiBGbG9hdFNpemUoYS53aWR0aCgpIC8gYiwgYS5o ZWlnaHQoKSAvIGIpOworfQorCiBpbmxpbmUgSW50U2l6ZSByb3VuZGVkSW50U2l6ZShjb25zdCBG bG9hdFNpemUmIHApCiB7CiAgICAgcmV0dXJuIEludFNpemUoY2xhbXBUb0ludGVnZXIocm91bmRm KHAud2lkdGgoKSkpLCBjbGFtcFRvSW50ZWdlcihyb3VuZGYocC5oZWlnaHQoKSkpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwCmluZGV4 IGRiNTFiODVkZGE1OTJlMjNiMzBmNmI5OTBlZDkwODYxNGUyMmFmNWQuLjcxNjg4Y2JlNjg2ODlm NjA3MmYwYTllMDQzNTc5M2ExZjE3NzhjYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcApAQCAtMTU4LDcgKzE1OCw3IEBAIHZvaWQg UVF1aWNrV2ViUGFnZVByaXZhdGU6OnVwZGF0ZVNpemUoKQogCiAgICAgRHJhd2luZ0FyZWFQcm94 eSogZHJhd2luZ0FyZWEgPSB3ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCk7CiAgICAgaWYgKGRy YXdpbmdBcmVhICYmIGRyYXdpbmdBcmVhLT5sYXllclRyZWVDb29yZGluYXRvclByb3h5KCkpCi0g ICAgICAgIGRyYXdpbmdBcmVhLT5sYXllclRyZWVDb29yZGluYXRvclByb3h5KCktPnNldENvbnRl bnRzU2l6ZShjb250ZW50c1NpemUpOworICAgICAgICBkcmF3aW5nQXJlYS0+bGF5ZXJUcmVlQ29v cmRpbmF0b3JQcm94eSgpLT5zZXRDb250ZW50c1NpemUoV2ViQ29yZTo6RmxvYXRTaXplKGNvbnRl bnRzU2l6ZSkpOwogCiAgICAgcS0+c2V0U2l6ZShzY2FsZWRTaXplKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAKaW5kZXggMWNhMjU5 MWJkYTZiYjY1MWI2MDk3OWVmYmVlZjNhODJhNTY3OGMzMi4uNTVjYTQ2YTlkZjNmMmViN2IzMmFh MWM1YTJlYzJjZDk5OWRjNTE2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC04MjksNyArODI5LDcgQEAgdm9pZCBRUXVpY2tX ZWJWaWV3TGVnYWN5UHJpdmF0ZTo6dXBkYXRlVmlld3BvcnRTaXplKCkKICAgICAvLyB3aGV0aGVy IGl0cyBmaXhlZCBvciBub3QuIFdlIHN0aWxsIG5lZWQgdG8gdGVsbCB0aGUgZHJhd2luZyBhcmVh IHdoaWNoIHBhcnQgb2YgaXQKICAgICAvLyBoYXMgdG8gYmUgcmVuZGVyZWQgb24gdGlsZXMsIGFu ZCBpbiBkZXNrdG9wIG1vZGUgaXQncyBhbGwgb2YgaXQuCiAgICAgd2ViUGFnZVByb3h5LT5kcmF3 aW5nQXJlYSgpLT5zZXRTaXplKHZpZXdwb3J0U2l6ZS50b1NpemUoKSwgSW50U2l6ZSgpKTsKLSAg ICB3ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCktPnNldFZpc2libGVDb250ZW50c1JlY3QoRmxv YXRSZWN0KEZsb2F0UG9pbnQoKSwgdmlld3BvcnRTaXplKSwgMSwgRmxvYXRQb2ludCgpKTsKKyAg ICB3ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCktPnNldFZpc2libGVDb250ZW50c1JlY3QoRmxv YXRSZWN0KEZsb2F0UG9pbnQoKSwgRmxvYXRTaXplKHZpZXdwb3J0U2l6ZSkpLCAxLCBGbG9hdFBv aW50KCkpOwogfQogCiBxcmVhbCBRUXVpY2tXZWJWaWV3TGVnYWN5UHJpdmF0ZTo6em9vbUZhY3Rv cigpIGNvbnN0CkBAIC04NzIsNyArODcyLDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxl UHJpdmF0ZTo6dXBkYXRlVmlld3BvcnRTaXplKCkKICAgICBRX1EoUVF1aWNrV2ViVmlldyk7CiAK ICAgICBpZiAobV9wYWdlVmlld3BvcnRDb250cm9sbGVyKQotICAgICAgICBtX3BhZ2VWaWV3cG9y dENvbnRyb2xsZXItPmRpZENoYW5nZVZpZXdwb3J0U2l6ZShRU2l6ZUYocS0+d2lkdGgoKSwgcS0+ aGVpZ2h0KCkpKTsKKyAgICAgICAgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyLT5kaWRDaGFuZ2VW aWV3cG9ydFNpemUoRmxvYXRTaXplKHEtPndpZHRoKCksIHEtPmhlaWdodCgpKSk7CiB9CiAKIHZv aWQgUVF1aWNrV2ViVmlld0ZsaWNrYWJsZVByaXZhdGU6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNv bnN0IFFQb2ludCYgcG9zKQo= 166927 2012-10-03 11:23:30 -0700 2012-10-03 13:42:02 -0700 Patch bug-98186-20121003152226.patch text/plain 7271 hugo.lima U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMjk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTA2YWIwMGI1YTM2ODc2 NzdkMjBjMDQxNDM3ODQzNzVjNTljNGY0MC4uMjAwZmZhNTQ0MWFlOTk3MzNhNmUwNGQ4OWI2NzBh Yjc2ZTU1OWM4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEwLTAzICBIdWdv IFBhcmVudGUgTGltYSAgPGh1Z28ubGltYUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtXSzJd IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwIGlzIHN1cHBvc2VkIHRvIGJlIGEgZ2VuZXJpYyBX ZWJLaXQyIGZpbGUgYnV0IG9ubHkgd29ya3Mgd2l0aCBRdCBwb3J0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgxODYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgRmxvYXRTaXplOjpzY2FsZWRUbyBt ZXRob2QgdG8gcmV0dXJuIGEgc2NhbGVkIGNvcHkgb2YgdGhlIEZsb2F0U2l6ZSBvYmplY3QsIHRo aXMgaXMgdXNlZCBieQorICAgICAgICBXZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250 cm9sbGVyLmNwcC4KKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIHJlbW92ZXMgdGhlIGltcGxpY2l0 IGNvbnZlcnNpb24gZnJvbSBXZWJDb3JlOjpGbG9hdFNpemUgdG8gUVNpemUuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZsb2F0 U2l6ZTo6c2NhbGVkVG8pOgorICAgICAgICAoRmxvYXRTaXplKToKKwogMjAxMi0xMC0wMyAgS2Vp c2hpIEhhdHRvcmkgIDxrZWlzaGlAd2Via2l0Lm9yZz4KIAogICAgICAgICBJbXBsZW1lbnQgRGF0 YUxpc3QgVUkgZm9yIGlucHV0IHR5cGUgdGltZSBvbiBjaHJvbWl1bQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDRh NDNjMGFiOWJiYjAzMGI2M2U3N2MwMDQ2MDYxNTkwNmZjMzFhMDEuLjIyNzY0MzQ4M2ZlYzExNTdm MWI5ZDE4YjJkOTAyMDYwMjk0NWNlZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAx Mi0xMC0wMyAgSHVnbyBQYXJlbnRlIExpbWEgIDxodWdvLmxpbWFAb3BlbmJvc3NhLm9yZz4KKwor ICAgICAgICBbV0syXSBQYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcCBpcyBzdXBwb3NlZCB0byBi ZSBhIGdlbmVyaWMgV2ViS2l0MiBmaWxlIGJ1dCBvbmx5IHdvcmtzIHdpdGggUXQgcG9ydC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MTg2CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHRoZSBk ZXBlbmRlY2Ugb2YgV2ViQ29yZTo6RmxvYXRTaXplIHRvIFFTaXplIGltcGxpY2l0IGNvbnZlcnNp b24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwOgorICAg ICAgICAoUVF1aWNrV2ViUGFnZVByaXZhdGU6OnVwZGF0ZVNpemUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHA6CisgICAgICAgIChRUXVpY2tXZWJWaWV3TGVn YWN5UHJpdmF0ZTo6dXBkYXRlVmlld3BvcnRTaXplKToKKyAgICAgICAgKFFRdWlja1dlYlZpZXdG bGlja2FibGVQcml2YXRlOjp1cGRhdGVWaWV3cG9ydFNpemUpOgorICAgICAgICAqIFVJUHJvY2Vz cy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdw b3J0Q29udHJvbGxlcjo6ZGlkUmVuZGVyRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmll d3BvcnRDb250cm9sbGVyOjpwYWdlRGlkUmVxdWVzdFNjcm9sbCk6CisgICAgICAgIChXZWJLaXQ6 OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnN5bmNWaXNpYmxlQ29udGVudHMpOgorCiAyMDEyLTEw LTAzICBBbGJlcnRvIEdhcmNpYSAgPGFnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RL XSBbV0syXSBVbnVzZWQgdmFyaWFibGUgaW4gd2Via2l0V2ViVmlld0xvYWRDaGFuZ2VkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0U2l6ZS5oCmluZGV4IGMwMjljNWE5 NTE4MjIwMGQ1MGJlZmQ3MjMxZDQzZWJhNDU3NTMyNTUuLmVlNjE2YTkxZDIzNGI3ZWZlOTBkNzE1 ZjAxYmNhN2M0YWQ0N2U2YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0Zsb2F0U2l6ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0Zsb2F0U2l6ZS5oCkBAIC05Nyw2ICs5NywxMSBAQCBwdWJsaWM6CiAgICAgICAgIG1faGVpZ2h0 ICo9IHNjYWxlWTsKICAgICB9CiAKKyAgICBGbG9hdFNpemUgc2NhbGVkVG8oZmxvYXQgcykgY29u c3QKKyAgICB7CisgICAgICAgIHJldHVybiBGbG9hdFNpemUobV93aWR0aCAqIHMsIG1faGVpZ2h0 ICogcyk7CisgICAgfQorCiAgICAgRmxvYXRTaXplIGV4cGFuZGVkVG8oY29uc3QgRmxvYXRTaXpl JiBvdGhlcikgY29uc3QKICAgICB7CiAgICAgICAgIHJldHVybiBGbG9hdFNpemUobV93aWR0aCA+ IG90aGVyLm1fd2lkdGggPyBtX3dpZHRoIDogb3RoZXIubV93aWR0aCwKQEAgLTEyMSw3ICsxMjYs NyBAQCBwdWJsaWM6CiAgICAgfQogCiAjaWYgUExBVEZPUk0oUVQpCi0gICAgRmxvYXRTaXplKGNv bnN0IFFTaXplRiYpOworICAgIGV4cGxpY2l0IEZsb2F0U2l6ZShjb25zdCBRU2l6ZUYmKTsKICAg ICBvcGVyYXRvciBRU2l6ZUYoKSBjb25zdDsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnBhZ2UuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNwcAppbmRleCBkYjUxYjg1ZGRhNTky ZTIzYjMwZjZiOTkwZWQ5MDg2MTRlMjJhZjVkLi43MTY4OGNiZTY4Njg5ZjYwNzJmMGE5ZTA0MzU3 OTNhMWYxNzc4Y2I1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3FxdWlja3dlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQv cXF1aWNrd2VicGFnZS5jcHAKQEAgLTE1OCw3ICsxNTgsNyBAQCB2b2lkIFFRdWlja1dlYlBhZ2VQ cml2YXRlOjp1cGRhdGVTaXplKCkKIAogICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVh ID0gd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpOwogICAgIGlmIChkcmF3aW5nQXJlYSAmJiBk cmF3aW5nQXJlYS0+bGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eSgpKQotICAgICAgICBkcmF3aW5n QXJlYS0+bGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eSgpLT5zZXRDb250ZW50c1NpemUoY29udGVu dHNTaXplKTsKKyAgICAgICAgZHJhd2luZ0FyZWEtPmxheWVyVHJlZUNvb3JkaW5hdG9yUHJveHko KS0+c2V0Q29udGVudHNTaXplKFdlYkNvcmU6OkZsb2F0U2l6ZShjb250ZW50c1NpemUpKTsKIAog ICAgIHEtPnNldFNpemUoc2NhbGVkU2l6ZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4IDFjYTI1OTFiZGE2YmI2NTFiNjA5 NzllZmJlZWYzYTgyYTU2NzhjMzIuLjU1Y2E0NmE5ZGYzZjJlYjdiMzJhYTFjNWEyZWMyY2Q5OTlk YzUxNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3 ZWJ2aWV3LmNwcApAQCAtODI5LDcgKzgyOSw3IEBAIHZvaWQgUVF1aWNrV2ViVmlld0xlZ2FjeVBy aXZhdGU6OnVwZGF0ZVZpZXdwb3J0U2l6ZSgpCiAgICAgLy8gd2hldGhlciBpdHMgZml4ZWQgb3Ig bm90LiBXZSBzdGlsbCBuZWVkIHRvIHRlbGwgdGhlIGRyYXdpbmcgYXJlYSB3aGljaCBwYXJ0IG9m IGl0CiAgICAgLy8gaGFzIHRvIGJlIHJlbmRlcmVkIG9uIHRpbGVzLCBhbmQgaW4gZGVza3RvcCBt b2RlIGl0J3MgYWxsIG9mIGl0LgogICAgIHdlYlBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKS0+c2V0 U2l6ZSh2aWV3cG9ydFNpemUudG9TaXplKCksIEludFNpemUoKSk7Ci0gICAgd2ViUGFnZVByb3h5 LT5kcmF3aW5nQXJlYSgpLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KEZsb2F0UmVjdChGbG9hdFBv aW50KCksIHZpZXdwb3J0U2l6ZSksIDEsIEZsb2F0UG9pbnQoKSk7CisgICAgd2ViUGFnZVByb3h5 LT5kcmF3aW5nQXJlYSgpLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KEZsb2F0UmVjdChGbG9hdFBv aW50KCksIEZsb2F0U2l6ZSh2aWV3cG9ydFNpemUpKSwgMSwgRmxvYXRQb2ludCgpKTsKIH0KIAog cXJlYWwgUVF1aWNrV2ViVmlld0xlZ2FjeVByaXZhdGU6Onpvb21GYWN0b3IoKSBjb25zdApAQCAt ODcyLDcgKzg3Miw3IEBAIHZvaWQgUVF1aWNrV2ViVmlld0ZsaWNrYWJsZVByaXZhdGU6OnVwZGF0 ZVZpZXdwb3J0U2l6ZSgpCiAgICAgUV9RKFFRdWlja1dlYlZpZXcpOwogCiAgICAgaWYgKG1fcGFn ZVZpZXdwb3J0Q29udHJvbGxlcikKLSAgICAgICAgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyLT5k aWRDaGFuZ2VWaWV3cG9ydFNpemUoUVNpemVGKHEtPndpZHRoKCksIHEtPmhlaWdodCgpKSk7Cisg ICAgICAgIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci0+ZGlkQ2hhbmdlVmlld3BvcnRTaXplKEZs b2F0U2l6ZShxLT53aWR0aCgpLCBxLT5oZWlnaHQoKSkpOwogfQogCiB2b2lkIFFRdWlja1dlYlZp ZXdGbGlja2FibGVQcml2YXRlOjpwYWdlRGlkUmVxdWVzdFNjcm9sbChjb25zdCBRUG9pbnQmIHBv cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250 cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9s bGVyLmNwcAppbmRleCBjNGNmYzUyZDQwY2M1NTQ5ZGMwNGZjNmJjZGY3ZGI2Y2I5YmQxMjVlLi4y YTVlOTBiM2FjY2E4NmRmYWNiY2IyNWJlZGRkNDY2M2ExZDkxYzY3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCkBAIC0xNDUs NyArMTQ1LDcgQEAgdm9pZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRSZW5kZXJGcmFtZShj b25zdCBJbnRTaXplJiBjb250ZW50c1NpemUsIGNvbnN0IEkKICAgICBpZiAobV92aWV3cG9ydFBv c0lzTG9ja2VkKSB7CiAgICAgICAgIEZsb2F0UG9pbnQgY2xhbXBlZFBvcyA9IGNsYW1wVmlld3Bv cnRUb0NvbnRlbnRzKG1fdmlld3BvcnRQb3MsIG1fZWZmZWN0aXZlU2NhbGUpOwogICAgICAgICAv LyBUaGVyZSBtaWdodCBiZSByZW5kZXJlZCBmcmFtZXMgbm90IGNvdmVyaW5nIG91ciByZXF1ZXN0 ZWQgcG9zaXRpb24geWV0LCB3YWl0IGZvciBpdC4KLSAgICAgICAgaWYgKEZsb2F0UmVjdChjbGFt cGVkUG9zLCBtX3ZpZXdwb3J0U2l6ZSAvIG1fZWZmZWN0aXZlU2NhbGUpLmludGVyc2VjdHMoY292 ZXJlZFJlY3QpKSB7CisgICAgICAgIGlmIChGbG9hdFJlY3QoY2xhbXBlZFBvcywgbV92aWV3cG9y dFNpemUuc2NhbGVkVG8oMSAvIG1fZWZmZWN0aXZlU2NhbGUpKS5pbnRlcnNlY3RzKGNvdmVyZWRS ZWN0KSkgewogICAgICAgICAgICAgbV9jbGllbnQtPnNldFZpZXdwb3J0UG9zaXRpb24oY2xhbXBl ZFBvcyk7CiAgICAgICAgICAgICBtX3ZpZXdwb3J0UG9zSXNMb2NrZWQgPSBmYWxzZTsKICAgICAg ICAgfQpAQCAtMTcyLDcgKzE3Miw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6cGFn ZURpZFJlcXVlc3RTY3JvbGwoY29uc3QgSW50UG9pbnQmIGNzc1Bvc2l0aW9uKQogICAgIGlmICht X2FjdGl2ZURlZmVycmVyQ291bnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIEZsb2F0UmVjdCBl bmRWaXNpYmxlQ29udGVudFJlY3QoY2xhbXBWaWV3cG9ydFRvQ29udGVudHMoY3NzUG9zaXRpb24s IG1fZWZmZWN0aXZlU2NhbGUpLCBtX3ZpZXdwb3J0U2l6ZSAvIG1fZWZmZWN0aXZlU2NhbGUpOwor ICAgIEZsb2F0UmVjdCBlbmRWaXNpYmxlQ29udGVudFJlY3QoY2xhbXBWaWV3cG9ydFRvQ29udGVu dHMoY3NzUG9zaXRpb24sIG1fZWZmZWN0aXZlU2NhbGUpLCBtX3ZpZXdwb3J0U2l6ZS5zY2FsZWRU bygxIC8gbV9lZmZlY3RpdmVTY2FsZSkpOwogICAgIGlmIChtX2xhc3RGcmFtZUNvdmVyZWRSZWN0 LmludGVyc2VjdHMoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KSkKICAgICAgICAgbV9jbGllbnQtPnNl dFZpZXdwb3J0UG9zaXRpb24oZW5kVmlzaWJsZUNvbnRlbnRSZWN0LmxvY2F0aW9uKCkpOwogICAg IGVsc2UKQEAgLTIxMCw3ICsyMTAsNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnN5 bmNWaXNpYmxlQ29udGVudHMoY29uc3QgRmxvYXRQb2ludCYgdHJhamVjdG9yeVZlYwogICAgIGlm ICghZHJhd2luZ0FyZWEgfHwgbV92aWV3cG9ydFNpemUuaXNFbXB0eSgpIHx8IG1fY29udGVudHNT aXplLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgRmxvYXRSZWN0IHZpc2libGVD b250ZW50c1JlY3QoY2xhbXBWaWV3cG9ydFRvQ29udGVudHMobV92aWV3cG9ydFBvcywgbV9lZmZl Y3RpdmVTY2FsZSksIG1fdmlld3BvcnRTaXplIC8gbV9lZmZlY3RpdmVTY2FsZSk7CisgICAgRmxv YXRSZWN0IHZpc2libGVDb250ZW50c1JlY3QoY2xhbXBWaWV3cG9ydFRvQ29udGVudHMobV92aWV3 cG9ydFBvcywgbV9lZmZlY3RpdmVTY2FsZSksIG1fdmlld3BvcnRTaXplLnNjYWxlZFRvKDEgLyBt X2VmZmVjdGl2ZVNjYWxlKSk7CiAgICAgdmlzaWJsZUNvbnRlbnRzUmVjdC5pbnRlcnNlY3QoRmxv YXRSZWN0KEZsb2F0UG9pbnQ6Onplcm8oKSwgbV9jb250ZW50c1NpemUpKTsKICAgICBkcmF3aW5n QXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2aXNpYmxlQ29udGVudHNSZWN0LCBtX2VmZmVj dGl2ZVNjYWxlLCB0cmFqZWN0b3J5VmVjdG9yKTsKIAo= 166953 2012-10-03 13:42:07 -0700 2012-10-03 14:52:09 -0700 Patch bug-98186-20121003174103.patch text/plain 8011 hugo.lima U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFjODFiZjIyMzhiYTRj OGU0ZjYwNzUzM2JkMWU4ZDRkYjZkYzZlYi4uYjAwOTZlYTAwMjVjMjg1MjQ3NWQ2M2FhZDhiOWQy YThjMzMwNTY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTEwLTAzICBIdWdv IFBhcmVudGUgTGltYSAgPGh1Z28ubGltYUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtXSzJd IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwIGlzIHN1cHBvc2VkIHRvIGJlIGEgZ2VuZXJpYyBX ZWJLaXQyIGZpbGUgYnV0IG9ubHkgd29ya3Mgd2l0aCBRdCBwb3J0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgxODYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdGhlIGltcGxpY2l0IGNvbnZl cnNpb24gZnJvbSBXZWJDb3JlOjpGbG9hdFNpemUgdG8gUVNpemUuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUuaDoKKyAgICAgICAgKEZsb2F0U2l6ZSk6CisKIDIwMTIt MTAtMDMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBDcmFzaCB3 aGVuIGNhbGxpbmcgZG9jdW1lbnQub3BlbiBkdXJpbmcgdW5sb2FkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTQz NWY0MDFmZTUzNDM2YWE1ZWIxM2U1ZDA4ZTVkMWJjNTY4MjYyZi4uYTkxY2I2NzMyMmIzMGIzZDc0 Mzg0ZTBkNWJiNGMxNTMxZTFlNGQ2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEy LTEwLTAzICBIdWdvIFBhcmVudGUgTGltYSAgPGh1Z28ubGltYUBvcGVuYm9zc2Eub3JnPgorCisg ICAgICAgIFtXSzJdIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwIGlzIHN1cHBvc2VkIHRvIGJl IGEgZ2VuZXJpYyBXZWJLaXQyIGZpbGUgYnV0IG9ubHkgd29ya3Mgd2l0aCBRdCBwb3J0LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgxODYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdGhlIGRl cGVuZGVjZSBvZiBXZWJDb3JlOjpGbG9hdFNpemUgdG8gUVNpemUgaW1wbGljaXQgY29udmVyc2lv bi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHA6CisgICAg ICAgIChRUXVpY2tXZWJQYWdlUHJpdmF0ZTo6dXBkYXRlU2l6ZSk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFFRdWlja1dlYlZpZXdMZWdh Y3lQcml2YXRlOjp1cGRhdGVWaWV3cG9ydFNpemUpOgorICAgICAgICAoUVF1aWNrV2ViVmlld0Zs aWNrYWJsZVByaXZhdGU6OnVwZGF0ZVZpZXdwb3J0U2l6ZSk6CisgICAgICAgICogVUlQcm9jZXNz L1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3Bv cnRDb250cm9sbGVyOjpkaWRSZW5kZXJGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3 cG9ydENvbnRyb2xsZXI6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKToKKyAgICAgICAgKFdlYktpdDo6 UGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6c3luY1Zpc2libGVDb250ZW50cyk6CisgICAgICAgIChX ZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnZpZXdwb3J0U2l6ZUluQ29udGVudHNDb29y ZGluYXRlcyk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlVmll d3BvcnRDb250cm9sbGVyLmg6CisgICAgICAgIChQYWdlVmlld3BvcnRDb250cm9sbGVyKToKKwog MjAxMi0xMC0wMiAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW1dl YktpdDJdIEFkZCB0aGUgYWJpbGl0eSB0byBzZW5kIG1lc3NhZ2VzIHRvIHRoZSBXZWJQYWdlR3Jv dXBQcm94eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxv YXRTaXplLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUuaApp bmRleCBjMDI5YzVhOTUxODIyMDBkNTBiZWZkNzIzMWQ0M2ViYTQ1NzUzMjU1Li4yYzljYzE4ZTMw NWZmMjRiMzlhOWFkYzllNzBhMTllMDMwZmQzZWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9GbG9hdFNpemUuaApAQCAtMTIxLDcgKzEyMSw3IEBAIHB1YmxpYzoKICAg ICB9CiAKICNpZiBQTEFURk9STShRVCkKLSAgICBGbG9hdFNpemUoY29uc3QgUVNpemVGJik7Cisg ICAgZXhwbGljaXQgRmxvYXRTaXplKGNvbnN0IFFTaXplRiYpOwogICAgIG9wZXJhdG9yIFFTaXpl RigpIGNvbnN0OwogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXF1aWNrd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3FxdWlja3dlYnBhZ2UuY3BwCmluZGV4IGRiNTFiODVkZGE1OTJlMjNiMzBmNmI5OTBlZDkw ODYxNGUyMmFmNWQuLjcxNjg4Y2JlNjg2ODlmNjA3MmYwYTllMDQzNTc5M2ExZjE3NzhjYjUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2VicGFnZS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJwYWdlLmNw cApAQCAtMTU4LDcgKzE1OCw3IEBAIHZvaWQgUVF1aWNrV2ViUGFnZVByaXZhdGU6OnVwZGF0ZVNp emUoKQogCiAgICAgRHJhd2luZ0FyZWFQcm94eSogZHJhd2luZ0FyZWEgPSB3ZWJQYWdlUHJveHkt PmRyYXdpbmdBcmVhKCk7CiAgICAgaWYgKGRyYXdpbmdBcmVhICYmIGRyYXdpbmdBcmVhLT5sYXll clRyZWVDb29yZGluYXRvclByb3h5KCkpCi0gICAgICAgIGRyYXdpbmdBcmVhLT5sYXllclRyZWVD b29yZGluYXRvclByb3h5KCktPnNldENvbnRlbnRzU2l6ZShjb250ZW50c1NpemUpOworICAgICAg ICBkcmF3aW5nQXJlYS0+bGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eSgpLT5zZXRDb250ZW50c1Np emUoV2ViQ29yZTo6RmxvYXRTaXplKGNvbnRlbnRzU2l6ZSkpOwogCiAgICAgcS0+c2V0U2l6ZShz Y2FsZWRTaXplKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJ2aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2Vidmlldy5jcHAKaW5kZXggMWNhMjU5MWJkYTZiYjY1MWI2MDk3OWVmYmVlZjNhODJhNTY3 OGMzMi4uNTVjYTQ2YTlkZjNmMmViN2IzMmFhMWM1YTJlYzJjZDk5OWRjNTE2MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCkBAIC04 MjksNyArODI5LDcgQEAgdm9pZCBRUXVpY2tXZWJWaWV3TGVnYWN5UHJpdmF0ZTo6dXBkYXRlVmll d3BvcnRTaXplKCkKICAgICAvLyB3aGV0aGVyIGl0cyBmaXhlZCBvciBub3QuIFdlIHN0aWxsIG5l ZWQgdG8gdGVsbCB0aGUgZHJhd2luZyBhcmVhIHdoaWNoIHBhcnQgb2YgaXQKICAgICAvLyBoYXMg dG8gYmUgcmVuZGVyZWQgb24gdGlsZXMsIGFuZCBpbiBkZXNrdG9wIG1vZGUgaXQncyBhbGwgb2Yg aXQuCiAgICAgd2ViUGFnZVByb3h5LT5kcmF3aW5nQXJlYSgpLT5zZXRTaXplKHZpZXdwb3J0U2l6 ZS50b1NpemUoKSwgSW50U2l6ZSgpKTsKLSAgICB3ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCkt PnNldFZpc2libGVDb250ZW50c1JlY3QoRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgdmlld3BvcnRT aXplKSwgMSwgRmxvYXRQb2ludCgpKTsKKyAgICB3ZWJQYWdlUHJveHktPmRyYXdpbmdBcmVhKCkt PnNldFZpc2libGVDb250ZW50c1JlY3QoRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgRmxvYXRTaXpl KHZpZXdwb3J0U2l6ZSkpLCAxLCBGbG9hdFBvaW50KCkpOwogfQogCiBxcmVhbCBRUXVpY2tXZWJW aWV3TGVnYWN5UHJpdmF0ZTo6em9vbUZhY3RvcigpIGNvbnN0CkBAIC04NzIsNyArODcyLDcgQEAg dm9pZCBRUXVpY2tXZWJWaWV3RmxpY2thYmxlUHJpdmF0ZTo6dXBkYXRlVmlld3BvcnRTaXplKCkK ICAgICBRX1EoUVF1aWNrV2ViVmlldyk7CiAKICAgICBpZiAobV9wYWdlVmlld3BvcnRDb250cm9s bGVyKQotICAgICAgICBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXItPmRpZENoYW5nZVZpZXdwb3J0 U2l6ZShRU2l6ZUYocS0+d2lkdGgoKSwgcS0+aGVpZ2h0KCkpKTsKKyAgICAgICAgbV9wYWdlVmll d3BvcnRDb250cm9sbGVyLT5kaWRDaGFuZ2VWaWV3cG9ydFNpemUoRmxvYXRTaXplKHEtPndpZHRo KCksIHEtPmhlaWdodCgpKSk7CiB9CiAKIHZvaWQgUVF1aWNrV2ViVmlld0ZsaWNrYWJsZVByaXZh dGU6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IFFQb2ludCYgcG9zKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3BwCmluZGV4IGM0 Y2ZjNTJkNDBjYzU1NDlkYzA0ZmM2YmNkZjdkYjZjYjliZDEyNWUuLjU1ZTY1MDUzMWNiNWUwYmNi OWU3ODM3ZTE5OTM3ODQyZDczNTE0MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKQEAgLTE0NSw3ICsxNDUsNyBAQCB2b2lk IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZFJlbmRlckZyYW1lKGNvbnN0IEludFNpemUmIGNv bnRlbnRzU2l6ZSwgY29uc3QgSQogICAgIGlmIChtX3ZpZXdwb3J0UG9zSXNMb2NrZWQpIHsKICAg ICAgICAgRmxvYXRQb2ludCBjbGFtcGVkUG9zID0gY2xhbXBWaWV3cG9ydFRvQ29udGVudHMobV92 aWV3cG9ydFBvcywgbV9lZmZlY3RpdmVTY2FsZSk7CiAgICAgICAgIC8vIFRoZXJlIG1pZ2h0IGJl IHJlbmRlcmVkIGZyYW1lcyBub3QgY292ZXJpbmcgb3VyIHJlcXVlc3RlZCBwb3NpdGlvbiB5ZXQs IHdhaXQgZm9yIGl0LgotICAgICAgICBpZiAoRmxvYXRSZWN0KGNsYW1wZWRQb3MsIG1fdmlld3Bv cnRTaXplIC8gbV9lZmZlY3RpdmVTY2FsZSkuaW50ZXJzZWN0cyhjb3ZlcmVkUmVjdCkpIHsKKyAg ICAgICAgaWYgKEZsb2F0UmVjdChjbGFtcGVkUG9zLCB2aWV3cG9ydFNpemVJbkNvbnRlbnRzQ29v cmRpbmF0ZXMoKSkuaW50ZXJzZWN0cyhjb3ZlcmVkUmVjdCkpIHsKICAgICAgICAgICAgIG1fY2xp ZW50LT5zZXRWaWV3cG9ydFBvc2l0aW9uKGNsYW1wZWRQb3MpOwogICAgICAgICAgICAgbV92aWV3 cG9ydFBvc0lzTG9ja2VkID0gZmFsc2U7CiAgICAgICAgIH0KQEAgLTE3Miw3ICsxNzIsNyBAQCB2 b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IElu dFBvaW50JiBjc3NQb3NpdGlvbikKICAgICBpZiAobV9hY3RpdmVEZWZlcnJlckNvdW50KQogICAg ICAgICByZXR1cm47CiAKLSAgICBGbG9hdFJlY3QgZW5kVmlzaWJsZUNvbnRlbnRSZWN0KGNsYW1w Vmlld3BvcnRUb0NvbnRlbnRzKGNzc1Bvc2l0aW9uLCBtX2VmZmVjdGl2ZVNjYWxlKSwgbV92aWV3 cG9ydFNpemUgLyBtX2VmZmVjdGl2ZVNjYWxlKTsKKyAgICBGbG9hdFJlY3QgZW5kVmlzaWJsZUNv bnRlbnRSZWN0KGNsYW1wVmlld3BvcnRUb0NvbnRlbnRzKGNzc1Bvc2l0aW9uLCBtX2VmZmVjdGl2 ZVNjYWxlKSwgdmlld3BvcnRTaXplSW5Db250ZW50c0Nvb3JkaW5hdGVzKCkpOwogICAgIGlmICht X2xhc3RGcmFtZUNvdmVyZWRSZWN0LmludGVyc2VjdHMoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KSkK ICAgICAgICAgbV9jbGllbnQtPnNldFZpZXdwb3J0UG9zaXRpb24oZW5kVmlzaWJsZUNvbnRlbnRS ZWN0LmxvY2F0aW9uKCkpOwogICAgIGVsc2UKQEAgLTIxMCw3ICsyMTAsNyBAQCB2b2lkIFBhZ2VW aWV3cG9ydENvbnRyb2xsZXI6OnN5bmNWaXNpYmxlQ29udGVudHMoY29uc3QgRmxvYXRQb2ludCYg dHJhamVjdG9yeVZlYwogICAgIGlmICghZHJhd2luZ0FyZWEgfHwgbV92aWV3cG9ydFNpemUuaXNF bXB0eSgpIHx8IG1fY29udGVudHNTaXplLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0g ICAgRmxvYXRSZWN0IHZpc2libGVDb250ZW50c1JlY3QoY2xhbXBWaWV3cG9ydFRvQ29udGVudHMo bV92aWV3cG9ydFBvcywgbV9lZmZlY3RpdmVTY2FsZSksIG1fdmlld3BvcnRTaXplIC8gbV9lZmZl Y3RpdmVTY2FsZSk7CisgICAgRmxvYXRSZWN0IHZpc2libGVDb250ZW50c1JlY3QoY2xhbXBWaWV3 cG9ydFRvQ29udGVudHMobV92aWV3cG9ydFBvcywgbV9lZmZlY3RpdmVTY2FsZSksIHZpZXdwb3J0 U2l6ZUluQ29udGVudHNDb29yZGluYXRlcygpKTsKICAgICB2aXNpYmxlQ29udGVudHNSZWN0Lmlu dGVyc2VjdChGbG9hdFJlY3QoRmxvYXRQb2ludDo6emVybygpLCBtX2NvbnRlbnRzU2l6ZSkpOwog ICAgIGRyYXdpbmdBcmVhLT5zZXRWaXNpYmxlQ29udGVudHNSZWN0KHZpc2libGVDb250ZW50c1Jl Y3QsIG1fZWZmZWN0aXZlU2NhbGUsIHRyYWplY3RvcnlWZWN0b3IpOwogCkBAIC0yMzEsNiArMjMx LDExIEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRBdHRy aWJ1dGVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0CiAgICAgbV9jbGllbnQtPmRpZENoYW5nZVZp ZXdwb3J0QXR0cmlidXRlcygpOwogfQogCitXZWJDb3JlOjpGbG9hdFNpemUgUGFnZVZpZXdwb3J0 Q29udHJvbGxlcjo6dmlld3BvcnRTaXplSW5Db250ZW50c0Nvb3JkaW5hdGVzKCkgY29uc3QKK3sK KyAgICByZXR1cm4gV2ViQ29yZTo6RmxvYXRTaXplKG1fdmlld3BvcnRTaXplLndpZHRoKCkgLyBt X2VmZmVjdGl2ZVNjYWxlLCBtX3ZpZXdwb3J0U2l6ZS5oZWlnaHQoKSAvIG1fZWZmZWN0aXZlU2Nh bGUpOworfQorCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OnN1c3BlbmRDb250ZW50KCkK IHsKICAgICBpZiAobV9oYXNTdXNwZW5kZWRDb250ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmgKaW5kZXggNzk5NTNkNzY0NjY2Njhl MjM3YjJiZTRjMDc0ZDQyNDYxNGExZWNjZi4uZTMwNTc1YWI5YTc3ZWU4M2U4NDU1NjVlMjNlNThm YTU3N2Y5NzZkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3 cG9ydENvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdw b3J0Q29udHJvbGxlci5oCkBAIC0xMDksNiArMTA5LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGFw cGx5U2NhbGVBZnRlclJlbmRlcmluZ0NvbnRlbnRzKGZsb2F0IHNjYWxlKTsKICAgICB2b2lkIGFw cGx5UG9zaXRpb25BZnRlclJlbmRlcmluZ0NvbnRlbnRzKGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9p bnQmIHBvcyk7CiAgICAgdm9pZCB1cGRhdGVNaW5pbXVtU2NhbGVUb0ZpdCgpOworICAgIFdlYkNv cmU6OkZsb2F0U2l6ZSB2aWV3cG9ydFNpemVJbkNvbnRlbnRzQ29vcmRpbmF0ZXMoKSBjb25zdDsK IAogICAgIFdlYlBhZ2VQcm94eSogY29uc3QgbV93ZWJQYWdlUHJveHk7CiAgICAgUGFnZVZpZXdw b3J0Q29udHJvbGxlckNsaWVudCogbV9jbGllbnQ7Cg==