147170 2015-07-21 16:17:36 -0700 Add a logging channel for Layout, remove the LiveConnect channel 2015-07-21 16:33:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 1111106 0 simon.fraser 2015-07-21 16:17:36 -0700 Add a logging channel for Layout, remove the LiveConnect channel 1111108 1 257214 simon.fraser 2015-07-21 16:18:23 -0700 Created attachment 257214 Patch 1111109 2 257215 simon.fraser 2015-07-21 16:20:46 -0700 Created attachment 257215 Patch 1111117 3 simon.fraser 2015-07-21 16:33:22 -0700 https://trac.webkit.org/r187134 257214 2015-07-21 16:18:23 -0700 2015-07-21 16:20:44 -0700 Patch bug-147170-20150721161709.patch text/plain 7793 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODAwMjkxZjlmNWIzMDk1 MDcxMjQ2M2ZiZTUxNzhiYzM0OWQ3MTU5MS4uM2M4MmVjODAxOGY4NjFlNDgzZTBkMmVmNTk0ZDIw ZDkxZDU4ZmUyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTIxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIGxvZ2dp bmcgY2hhbm5lbCBmb3IgTGF5b3V0LCByZW1vdmUgdGhlIExpdmVDb25uZWN0IGNoYW5uZWwKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzE3MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cyAoT09QUyEpLgorCisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RnJhbWVWaWV3OjphZGp1c3RWaWV3U2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZVZpZXc6OmZvcmNlTGF5b3V0UGFyZW50Vmlld0lmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6bGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6cGVyZm9y bVBvc3RMYXlvdXRUYXNrcyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmF1dG9TaXpl SWZFbmFibGVkKToKKyAgICAgICAgKiBwbGF0Zm9ybS9Mb2dnaW5nLmg6CisKIDIwMTUtMDctMjAg IE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogU2VsZWN0aW9uIGNo YW5nZSBhcyBhIHJlc3VsdCBvZiBmb2N1c2luZyBhbiBlbGVtZW50IG1heSBjYXVzZSBTYWZhcmkg dG8gY3Jhc2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAxZmIxNzI1YTNmNGEyNDI2NjhiMGU1MGM0Mjgw NzIwM2M5OTRlMjMwLi42OTQ1ZjMyOGZhNGQwOTVmNDFjZDg1ZmUwNWJmNjAyNzMyODc4Y2E4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktp dC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTUtMDctMjEgIFNpbW9uIEZyYXNl ciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgbG9nZ2luZyBjaGFu bmVsIGZvciBMYXlvdXQsIHJlbW92ZSB0aGUgTGl2ZUNvbm5lY3QgY2hhbm5lbAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MTcwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBBZGQgYSBsYXlv dXQgbG9nZ2luZyBjaGFubmVsIHRvIFdlYkNvcmUsIGFuZCByZW1vdmUgdGhlIExpdmVDb25uZWN0 IGNoYW5uZWwuCisKKyAgICAgICAgKiBNaXNjL1dlYktpdExvZ2dpbmcuaDoKKyAgICAgICAgKiBQ bHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZS5tbToKKyAgICAgICAgKC1bV2ViTmV0c2Nh cGVQbHVnaW5QYWNrYWdlIF90cnlMb2FkXSk6IERlbGV0ZWQuCisKIDIwMTUtMDctMTggIEd5dXlv dW5nIEtpbSAgPGd5dXlvdW5nLmtpbUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlZHVjZSBQYXNz UmVmUHRyIGluIFdlYktpdDIgLSAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggMWQw NGY3NzZjNjcyNzI3MTNkYmEzZjdhMTFhNmRmNWU1Zjg3MTc0Ni4uNjlkZDY5YzIzYjhmZTk4NDdi ZTYxMmUwYjQ3OTI4MTgyYTYwZWM4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAt NjE0LDYgKzYxNCw4IEBAIHZvaWQgRnJhbWVWaWV3OjphZGp1c3RWaWV3U2l6ZSgpCiAgICAgY29u c3QgSW50U2l6ZSYgc2l6ZSA9IHJlY3Quc2l6ZSgpOwogICAgIFNjcm9sbFZpZXc6OnNldFNjcm9s bE9yaWdpbihJbnRQb2ludCgtcmVjdC54KCksIC1yZWN0LnkoKSksICFmcmFtZSgpLmRvY3VtZW50 KCktPnByaW50aW5nKCksIHNpemUgPT0gY29udGVudHNTaXplKCkpOwogCisgICAgTE9HKExheW91 dCwgIkZyYW1lVmlldyAlcCBhZGp1c3RWaWV3U2l6ZTogdW5zY2FsZWQgZG9jdW1lbnQgc2l6ZSBj aGFuZ2VkIHRvICVkeCVkIChzY2FsZWQgdG8gJWR4JWQpIiwgdGhpcywgcmVuZGVyVmlldy0+dW5z Y2FsZWREb2N1bWVudFJlY3QoKS53aWR0aCgpLCByZW5kZXJWaWV3LT51bnNjYWxlZERvY3VtZW50 UmVjdCgpLmhlaWdodCgpLCBzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOworCiAgICAgc2V0 Q29udGVudHNTaXplKHNpemUpOwogfQogCkBAIC0xMTQ2LDYgKzExNDgsOCBAQCBpbmxpbmUgdm9p ZCBGcmFtZVZpZXc6OmZvcmNlTGF5b3V0UGFyZW50Vmlld0lmTmVlZGVkKCkKICAgICBpZiAoc3Zn Um9vdC5ldmVySGFkTGF5b3V0KCkgJiYgIXN2Z1Jvb3QubmVlZHNMYXlvdXQoKSkKICAgICAgICAg cmV0dXJuOwogCisgICAgTE9HKExheW91dCwgIkZyYW1lVmlldyAlcCBmb3JjZUxheW91dFBhcmVu dFZpZXdJZk5lZWRlZCBzY2hlZHVsaW5nIGxheW91dCBvbiBwYXJlbnQgRnJhbWVWaWV3ICVwIiwg dGhpcywgJm93bmVyUmVuZGVyZXItPnZpZXcoKS5mcmFtZVZpZXcoKSk7CisKICAgICAvLyBJZiB0 aGUgZW1iZWRkZWQgU1ZHIGRvY3VtZW50IGFwcGVhcnMgdGhlIGZpcnN0IHRpbWUsIHRoZSBvd25l clJlbmRlcmVyIGhhcyBhbHJlYWR5IGZpbmlzaGVkCiAgICAgLy8gbGF5b3V0IHdpdGhvdXQga25v d2luZyBhYm91dCB0aGUgZXhpc3RlbmNlIG9mIHRoZSBlbWJlZGRlZCBTVkcgZG9jdW1lbnQsIGJl Y2F1c2UgUmVuZGVyUmVwbGFjZWQKICAgICAvLyBlbWJlZGRlZENvbnRlbnRCb3goKSByZXR1cm5z IG51bGxwdHIsIGFzIGxvbmcgYXMgdGhlIGVtYmVkZGVkIGRvY3VtZW50IGlzbid0IGxvYWRlZCB5 ZXQuIEJlZm9yZQpAQCAtMTE2MCwxMSArMTE2NCwxNiBAQCBpbmxpbmUgdm9pZCBGcmFtZVZpZXc6 OmZvcmNlTGF5b3V0UGFyZW50Vmlld0lmTmVlZGVkKCkKIAogdm9pZCBGcmFtZVZpZXc6OmxheW91 dChib29sIGFsbG93U3VidHJlZSkKIHsKLSAgICBpZiAoaXNJbkxheW91dCgpKQorICAgIExPRyhM YXlvdXQsICJGcmFtZVZpZXcgJXAgKCVkeCVkKSBsYXlvdXQsIG1haW4gZnJhbWV2aWV3ICVkLCBh bGxvd1N1YnRyZWU9JWQiLCB0aGlzLCBzaXplKCkud2lkdGgoKSwgc2l6ZSgpLmhlaWdodCgpLCBm cmFtZSgpLmlzTWFpbkZyYW1lKCksIGFsbG93U3VidHJlZSk7CisgICAgaWYgKGlzSW5MYXlvdXQo KSkgeworICAgICAgICBMT0coTGF5b3V0LCAiICBpbiBsYXlvdXQsIGJhaWxpbmciKTsKICAgICAg ICAgcmV0dXJuOworICAgIH0KIAotICAgIGlmIChsYXlvdXREaXNhbGxvd2VkKCkpCisgICAgaWYg KGxheW91dERpc2FsbG93ZWQoKSkgeworICAgICAgICBMT0coTGF5b3V0LCAiICBsYXlvdXQgaXMg ZGlzYWxsb3dlZCwgYmFpbGluZyIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgLy8g UHJvdGVjdCB0aGUgdmlldyBmcm9tIGJlaW5nIGRlbGV0ZWQgZHVyaW5nIGxheW91dCAoaW4gcmVj YWxjU3R5bGUpLgogICAgIFJlZjxGcmFtZVZpZXc+IHByb3RlY3QoKnRoaXMpOwpAQCAtMTE4MCw2 ICsxMTg5LDcgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkKIAog ICAgIGlmIChpbkNoaWxkRnJhbWVMYXlvdXRXaXRoRnJhbWVGbGF0dGVuaW5nKSB7CiAgICAgICAg IHN0YXJ0TGF5b3V0QXRNYWluRnJhbWVWaWV3SWZOZWVkZWQoYWxsb3dTdWJ0cmVlKTsKKyAgICAg ICAgTE9HKExheW91dCwgIiAgZnJhbWUgZmxhdHRlbmluZywgc3RhcnRpbmcgZnJvbSByb290Iik7 CiAgICAgICAgIFJlbmRlckVsZW1lbnQqIHJvb3QgPSBtX2xheW91dFJvb3QgPyBtX2xheW91dFJv b3QgOiBmcmFtZSgpLmRvY3VtZW50KCktPnJlbmRlclZpZXcoKTsKICAgICAgICAgaWYgKCFyb290 IHx8ICFyb290LT5uZWVkc0xheW91dCgpKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTIzMSw2 ICsxMjQxLDcgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZSkKICAg ICAgICAgLy8gVmlld3BvcnQtZGVwZW5kZW50IG1lZGlhIHF1ZXJpZXMgbWF5IGNhdXNlIHVzIHRv IG5lZWQgY29tcGxldGVseSBkaWZmZXJlbnQgc3R5bGUgaW5mb3JtYXRpb24uCiAgICAgICAgIFN0 eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIgPSBkb2N1bWVudC5zdHlsZVJlc29sdmVySWZFeGlz dHMoKTsKICAgICAgICAgaWYgKCFzdHlsZVJlc29sdmVyIHx8IHN0eWxlUmVzb2x2ZXItPmhhc01l ZGlhUXVlcmllc0FmZmVjdGVkQnlWaWV3cG9ydENoYW5nZSgpKSB7CisgICAgICAgICAgICBMT0co TGF5b3V0LCAiICBoYXNNZWRpYVF1ZXJpZXNBZmZlY3RlZEJ5Vmlld3BvcnRDaGFuZ2UsIGVucXVl dWVpbmcgc3R5bGUgcmVjYWxjIik7CiAgICAgICAgICAgICBkb2N1bWVudC5zdHlsZVJlc29sdmVy Q2hhbmdlZChEZWZlclJlY2FsY1N0eWxlKTsKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlu c3RydW1lbnRhdGlvbiBldmVudCBpcyBub3Qgc3RyaWN0bHkgYWNjdXJhdGUgc2luY2UgY2FjaGVk IG1lZGlhIHF1ZXJ5IHJlc3VsdHMgZG8gbm90IHBlcnNpc3QgYWNyb3NzIFN0eWxlUmVzb2x2ZXIg cmVidWlsZHMuCiAgICAgICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Om1lZGlhUXVl cnlSZXN1bHRDaGFuZ2VkKGRvY3VtZW50KTsKQEAgLTEzMjUsNiArMTMzNiw3IEBAIHZvaWQgRnJh bWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAgICAgICAgICBtX3NpemUgPSBs YXlvdXRTaXplKCk7CiAKICAgICAgICAgICAgIGlmIChvbGRTaXplICE9IG1fc2l6ZSkgeworICAg ICAgICAgICAgICAgIExPRyhMYXlvdXQsICIgIGxheW91dCBzaXplIGNoYW5nZWQgZnJvbSAlLjNm eCUuM2YgdG8gJS4zZnglLjNmIiwgb2xkU2l6ZS53aWR0aCgpLnRvRmxvYXQoKSwgb2xkU2l6ZS5o ZWlnaHQoKS50b0Zsb2F0KCksIG1fc2l6ZS53aWR0aCgpLnRvRmxvYXQoKSwgbV9zaXplLmhlaWdo dCgpLnRvRmxvYXQoKSk7CiAgICAgICAgICAgICAgICAgbV9uZWVkc0Z1bGxSZXBhaW50ID0gdHJ1 ZTsKICAgICAgICAgICAgICAgICBpZiAoIW1fZmlyc3RMYXlvdXQpIHsKICAgICAgICAgICAgICAg ICAgICAgUmVuZGVyQm94KiByb290UmVuZGVyZXIgPSBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQo KSA/IGRvY3VtZW50LmRvY3VtZW50RWxlbWVudCgpLT5yZW5kZXJCb3goKSA6IG51bGxwdHI7CkBA IC0zMDE0LDYgKzMwMjYsOCBAQCB2b2lkIEZyYW1lVmlldzo6Zmx1c2hBbnlQZW5kaW5nUG9zdExh eW91dFRhc2tzKCkKIAogdm9pZCBGcmFtZVZpZXc6OnBlcmZvcm1Qb3N0TGF5b3V0VGFza3MoKQog eworICAgIExPRyhMYXlvdXQsICJGcmFtZVZpZXcgJXAgcGVyZm9ybVBvc3RMYXlvdXRUYXNrcyIs IHRoaXMpOworCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBub3QgcnVuIGFueSBKYXZhU2NyaXB0 IGNvZGUgaW4gdGhpcyBmdW5jdGlvbi4KIAogICAgIG1fcG9zdExheW91dFRhc2tzVGltZXIuc3Rv cCgpOwpAQCAtMzE2Myw2ICszMTc3LDggQEAgdm9pZCBGcmFtZVZpZXc6OmF1dG9TaXplSWZFbmFi bGVkKCkKICAgICBpZiAobV9pbkF1dG9TaXplKQogICAgICAgICByZXR1cm47CiAKKyAgICBMT0co TGF5b3V0LCAiRnJhbWVWaWV3ICVwIGF1dG9TaXplSWZFbmFibGVkIiwgdGhpcyk7CisKICAgICBU ZW1wb3JhcnlDaGFuZ2U8Ym9vbD4gY2hhbmdlSW5BdXRvU2l6ZShtX2luQXV0b1NpemUsIHRydWUp OwogCiAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gZnJhbWUoKS5kb2N1bWVudCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9nZ2luZy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vTG9nZ2luZy5oCmluZGV4IDIyOGJjOTUyMDMzMjQ2OGJiZWNmYTRkNzRiNzA4NWU4 ZjIzMWJiMWEuLjQwODE5OWVmNDUyZjA1MWEzZWM0OTNjNjM2N2FmN2I1ZDZiNzZiMjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9Mb2dnaW5nLmgKQEAgLTUzLDcgKzUzLDcgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgIE0oR2FtZXBhZCkgXAogICAgIE0oSGlzdG9yeSkgXAogICAgIE0oSWNvbkRhdGFi YXNlKSBcCi0gICAgTShMaXZlQ29ubmVjdCkgXAorICAgIE0oTGF5b3V0KSBcCiAgICAgTShMb2Fk aW5nKSBcCiAgICAgTShNZWRpYSkgXAogICAgIE0oTWVkaWFTb3VyY2UpIFwKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViS2l0TG9nZ2luZy5oIGIvU291cmNlL1dlYktpdC9t YWMvTWlzYy9XZWJLaXRMb2dnaW5nLmgKaW5kZXggMGEyZTVjZDJmNGE1MDRhMjM3MGU3ZGEyMzQ2 MzhjZmZkOGNjY2FjMC4uYjYyZDEzM2RhMTk3ZGVjNjZhZmQzNzA1NDZjMGNhNDYwN2RiMjYyYiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJLaXRMb2dnaW5nLmgKKysrIGIv U291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJLaXRMb2dnaW5nLmgKQEAgLTUzLDcgKzUzLDYgQEAg ZXh0ZXJuICJDIiB7CiAgICAgTShGb3JtRGVsZWdhdGUpIFwKICAgICBNKEhpc3RvcnkpIFwKICAg ICBNKEljb25EYXRhYmFzZSkgXAotICAgIE0oTGl2ZUNvbm5lY3QpIFwKICAgICBNKExvYWRpbmcp IFwKICAgICBNKFBhZ2VDYWNoZSkgXAogICAgIE0oUGx1Z2luRXZlbnRzKSBcCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZS5tbSBi L1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlLm1tCmlu ZGV4IDA2MzIzNzE0Yjg1MzM0N2Q1MTZjYWVhNzdlZGU2MTk1ZWE5ZTFjNjguLjc0YmMzYTI5NWQ4 NTc4ODU3MTc3MmRmMzEwMzI1YWEwMzBkM2ZiMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlLm1tCkBAIC0yNTksMTEgKzI1 OSw2IEBAIC0gKEJPT0wpX3RyeUxvYWQKICAgICBwbHVnaW5TaXplID0gcGx1Z2luRnVuY3Muc2l6 ZTsKICAgICBwbHVnaW5WZXJzaW9uID0gcGx1Z2luRnVuY3MudmVyc2lvbjsKIAotICAgIGlmIChw bHVnaW5GdW5jcy5qYXZhQ2xhc3MpCi0gICAgICAgIExPRyhMaXZlQ29ubmVjdCwgIiVAOiAgbWFj aC1vIGVudHJ5IHBvaW50IGZvciBOUFBfR2V0SmF2YUNsYXNzID0gJXAiLCAoTlNTdHJpbmcgKilb c2VsZiBwbHVnaW5JbmZvXS5uYW1lLCBwbHVnaW5GdW5jcy5qYXZhQ2xhc3MpOwotICAgIGVsc2UK LSAgICAgICAgTE9HKExpdmVDb25uZWN0LCAiJUA6ICBubyBlbnRyeSBwb2ludCBmb3IgTlBQX0dl dEphdmFDbGFzcyIsIChOU1N0cmluZyAqKVtzZWxmIHBsdWdpbkluZm9dLm5hbWUpOwotCiAjaWYg IUxPR19ESVNBQkxFRAogICAgIGN1cnJlbnRUaW1lID0gQ0ZBYnNvbHV0ZVRpbWVHZXRDdXJyZW50 KCk7CiAgICAgZHVyYXRpb24gPSBjdXJyZW50VGltZSAtIHN0YXJ0Owo= 257215 2015-07-21 16:20:46 -0700 2015-07-21 16:22:19 -0700 Patch bug-147170-20150721161933.patch text/plain 7848 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MDcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODAwMjkxZjlmNWIzMDk1 MDcxMjQ2M2ZiZTUxNzhiYzM0OWQ3MTU5MS4uNmUzNWU4MjBkNjE0YzFiMjVhMzg1MzViNGE3ZmJm Nzg3Yzc0OTc0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTA3LTIxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIGxvZ2dp bmcgY2hhbm5lbCBmb3IgTGF5b3V0LCByZW1vdmUgdGhlIExpdmVDb25uZWN0IGNoYW5uZWwKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzE3MAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGxheW91 dCBsb2dnaW5nIGNoYW5uZWwgdG8gV2ViQ29yZSwgYW5kIHJlbW92ZSB0aGUgTGl2ZUNvbm5lY3Qg Y2hhbm5lbC4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lVmlldzo6YWRqdXN0Vmlld1NpemUpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3Ojpmb3JjZUxheW91dFBhcmVudFZpZXdJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpG cmFtZVZpZXc6OmxheW91dCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnBlcmZvcm1Q b3N0TGF5b3V0VGFza3MpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjphdXRvU2l6ZUlm RW5hYmxlZCk6CisgICAgICAgICogcGxhdGZvcm0vTG9nZ2luZy5oOgorCiAyMDE1LTA3LTIwICBO YW4gV2FuZyAgPG5fd2FuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IFNlbGVjdGlvbiBjaGFu Z2UgYXMgYSByZXN1bHQgb2YgZm9jdXNpbmcgYW4gZWxlbWVudCBtYXkgY2F1c2UgU2FmYXJpIHRv IGNyYXNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMWZiMTcyNWEzZjRhMjQyNjY4YjBlNTBjNDI4MDcy MDNjOTk0ZTIzMC4uNjk0NWYzMjhmYTRkMDk1ZjQxY2Q4NWZlMDViZjYwMjczMjg3OGNhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA3LTIxICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIGxvZ2dpbmcgY2hhbm5l bCBmb3IgTGF5b3V0LCByZW1vdmUgdGhlIExpdmVDb25uZWN0IGNoYW5uZWwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzE3MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgQWRkIGEgbGF5b3V0 IGxvZ2dpbmcgY2hhbm5lbCB0byBXZWJDb3JlLCBhbmQgcmVtb3ZlIHRoZSBMaXZlQ29ubmVjdCBj aGFubmVsLgorCisgICAgICAgICogTWlzYy9XZWJLaXRMb2dnaW5nLmg6CisgICAgICAgICogUGx1 Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW06CisgICAgICAgICgtW1dlYk5ldHNjYXBl UGx1Z2luUGFja2FnZSBfdHJ5TG9hZF0pOiBEZWxldGVkLgorCiAyMDE1LTA3LTE4ICBHeXV5b3Vu ZyBLaW0gIDxneXV5b3VuZy5raW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZWR1Y2UgUGFzc1Jl ZlB0ciBpbiBXZWJLaXQyIC0gMwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmluZGV4IDFkMDRm Nzc2YzY3MjcyNzEzZGJhM2Y3YTExYTZkZjVlNWY4NzE3NDYuLjY5ZGQ2OWMyM2I4ZmU5ODQ3YmU2 MTJlMGI0NzkyODE4MmE2MGVjOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKQEAgLTYx NCw2ICs2MTQsOCBAQCB2b2lkIEZyYW1lVmlldzo6YWRqdXN0Vmlld1NpemUoKQogICAgIGNvbnN0 IEludFNpemUmIHNpemUgPSByZWN0LnNpemUoKTsKICAgICBTY3JvbGxWaWV3OjpzZXRTY3JvbGxP cmlnaW4oSW50UG9pbnQoLXJlY3QueCgpLCAtcmVjdC55KCkpLCAhZnJhbWUoKS5kb2N1bWVudCgp LT5wcmludGluZygpLCBzaXplID09IGNvbnRlbnRzU2l6ZSgpKTsKIAorICAgIExPRyhMYXlvdXQs ICJGcmFtZVZpZXcgJXAgYWRqdXN0Vmlld1NpemU6IHVuc2NhbGVkIGRvY3VtZW50IHNpemUgY2hh bmdlZCB0byAlZHglZCAoc2NhbGVkIHRvICVkeCVkKSIsIHRoaXMsIHJlbmRlclZpZXctPnVuc2Nh bGVkRG9jdW1lbnRSZWN0KCkud2lkdGgoKSwgcmVuZGVyVmlldy0+dW5zY2FsZWREb2N1bWVudFJl Y3QoKS5oZWlnaHQoKSwgc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdodCgpKTsKKwogICAgIHNldENv bnRlbnRzU2l6ZShzaXplKTsKIH0KIApAQCAtMTE0Niw2ICsxMTQ4LDggQEAgaW5saW5lIHZvaWQg RnJhbWVWaWV3Ojpmb3JjZUxheW91dFBhcmVudFZpZXdJZk5lZWRlZCgpCiAgICAgaWYgKHN2Z1Jv b3QuZXZlckhhZExheW91dCgpICYmICFzdmdSb290Lm5lZWRzTGF5b3V0KCkpCiAgICAgICAgIHJl dHVybjsKIAorICAgIExPRyhMYXlvdXQsICJGcmFtZVZpZXcgJXAgZm9yY2VMYXlvdXRQYXJlbnRW aWV3SWZOZWVkZWQgc2NoZWR1bGluZyBsYXlvdXQgb24gcGFyZW50IEZyYW1lVmlldyAlcCIsIHRo aXMsICZvd25lclJlbmRlcmVyLT52aWV3KCkuZnJhbWVWaWV3KCkpOworCiAgICAgLy8gSWYgdGhl IGVtYmVkZGVkIFNWRyBkb2N1bWVudCBhcHBlYXJzIHRoZSBmaXJzdCB0aW1lLCB0aGUgb3duZXJS ZW5kZXJlciBoYXMgYWxyZWFkeSBmaW5pc2hlZAogICAgIC8vIGxheW91dCB3aXRob3V0IGtub3dp bmcgYWJvdXQgdGhlIGV4aXN0ZW5jZSBvZiB0aGUgZW1iZWRkZWQgU1ZHIGRvY3VtZW50LCBiZWNh dXNlIFJlbmRlclJlcGxhY2VkCiAgICAgLy8gZW1iZWRkZWRDb250ZW50Qm94KCkgcmV0dXJucyBu dWxscHRyLCBhcyBsb25nIGFzIHRoZSBlbWJlZGRlZCBkb2N1bWVudCBpc24ndCBsb2FkZWQgeWV0 LiBCZWZvcmUKQEAgLTExNjAsMTEgKzExNjQsMTYgQEAgaW5saW5lIHZvaWQgRnJhbWVWaWV3Ojpm b3JjZUxheW91dFBhcmVudFZpZXdJZk5lZWRlZCgpCiAKIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQo Ym9vbCBhbGxvd1N1YnRyZWUpCiB7Ci0gICAgaWYgKGlzSW5MYXlvdXQoKSkKKyAgICBMT0coTGF5 b3V0LCAiRnJhbWVWaWV3ICVwICglZHglZCkgbGF5b3V0LCBtYWluIGZyYW1ldmlldyAlZCwgYWxs b3dTdWJ0cmVlPSVkIiwgdGhpcywgc2l6ZSgpLndpZHRoKCksIHNpemUoKS5oZWlnaHQoKSwgZnJh bWUoKS5pc01haW5GcmFtZSgpLCBhbGxvd1N1YnRyZWUpOworICAgIGlmIChpc0luTGF5b3V0KCkp IHsKKyAgICAgICAgTE9HKExheW91dCwgIiAgaW4gbGF5b3V0LCBiYWlsaW5nIik7CiAgICAgICAg IHJldHVybjsKKyAgICB9CiAKLSAgICBpZiAobGF5b3V0RGlzYWxsb3dlZCgpKQorICAgIGlmIChs YXlvdXREaXNhbGxvd2VkKCkpIHsKKyAgICAgICAgTE9HKExheW91dCwgIiAgbGF5b3V0IGlzIGRp c2FsbG93ZWQsIGJhaWxpbmciKTsKICAgICAgICAgcmV0dXJuOworICAgIH0KIAogICAgIC8vIFBy b3RlY3QgdGhlIHZpZXcgZnJvbSBiZWluZyBkZWxldGVkIGR1cmluZyBsYXlvdXQgKGluIHJlY2Fs Y1N0eWxlKS4KICAgICBSZWY8RnJhbWVWaWV3PiBwcm90ZWN0KCp0aGlzKTsKQEAgLTExODAsNiAr MTE4OSw3IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAKICAg ICBpZiAoaW5DaGlsZEZyYW1lTGF5b3V0V2l0aEZyYW1lRmxhdHRlbmluZykgewogICAgICAgICBz dGFydExheW91dEF0TWFpbkZyYW1lVmlld0lmTmVlZGVkKGFsbG93U3VidHJlZSk7CisgICAgICAg IExPRyhMYXlvdXQsICIgIGZyYW1lIGZsYXR0ZW5pbmcsIHN0YXJ0aW5nIGZyb20gcm9vdCIpOwog ICAgICAgICBSZW5kZXJFbGVtZW50KiByb290ID0gbV9sYXlvdXRSb290ID8gbV9sYXlvdXRSb290 IDogZnJhbWUoKS5kb2N1bWVudCgpLT5yZW5kZXJWaWV3KCk7CiAgICAgICAgIGlmICghcm9vdCB8 fCAhcm9vdC0+bmVlZHNMYXlvdXQoKSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTEyMzEsNiAr MTI0MSw3IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUpCiAgICAg ICAgIC8vIFZpZXdwb3J0LWRlcGVuZGVudCBtZWRpYSBxdWVyaWVzIG1heSBjYXVzZSB1cyB0byBu ZWVkIGNvbXBsZXRlbHkgZGlmZmVyZW50IHN0eWxlIGluZm9ybWF0aW9uLgogICAgICAgICBTdHls ZVJlc29sdmVyKiBzdHlsZVJlc29sdmVyID0gZG9jdW1lbnQuc3R5bGVSZXNvbHZlcklmRXhpc3Rz KCk7CiAgICAgICAgIGlmICghc3R5bGVSZXNvbHZlciB8fCBzdHlsZVJlc29sdmVyLT5oYXNNZWRp YVF1ZXJpZXNBZmZlY3RlZEJ5Vmlld3BvcnRDaGFuZ2UoKSkgeworICAgICAgICAgICAgTE9HKExh eW91dCwgIiAgaGFzTWVkaWFRdWVyaWVzQWZmZWN0ZWRCeVZpZXdwb3J0Q2hhbmdlLCBlbnF1ZXVl aW5nIHN0eWxlIHJlY2FsYyIpOwogICAgICAgICAgICAgZG9jdW1lbnQuc3R5bGVSZXNvbHZlckNo YW5nZWQoRGVmZXJSZWNhbGNTdHlsZSk7CiAgICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBpbnN0 cnVtZW50YXRpb24gZXZlbnQgaXMgbm90IHN0cmljdGx5IGFjY3VyYXRlIHNpbmNlIGNhY2hlZCBt ZWRpYSBxdWVyeSByZXN1bHRzIGRvIG5vdCBwZXJzaXN0IGFjcm9zcyBTdHlsZVJlc29sdmVyIHJl YnVpbGRzLgogICAgICAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjptZWRpYVF1ZXJ5 UmVzdWx0Q2hhbmdlZChkb2N1bWVudCk7CkBAIC0xMzI1LDYgKzEzMzYsNyBAQCB2b2lkIEZyYW1l Vmlldzo6bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlKQogICAgICAgICAgICAgbV9zaXplID0gbGF5 b3V0U2l6ZSgpOwogCiAgICAgICAgICAgICBpZiAob2xkU2l6ZSAhPSBtX3NpemUpIHsKKyAgICAg ICAgICAgICAgICBMT0coTGF5b3V0LCAiICBsYXlvdXQgc2l6ZSBjaGFuZ2VkIGZyb20gJS4zZngl LjNmIHRvICUuM2Z4JS4zZiIsIG9sZFNpemUud2lkdGgoKS50b0Zsb2F0KCksIG9sZFNpemUuaGVp Z2h0KCkudG9GbG9hdCgpLCBtX3NpemUud2lkdGgoKS50b0Zsb2F0KCksIG1fc2l6ZS5oZWlnaHQo KS50b0Zsb2F0KCkpOwogICAgICAgICAgICAgICAgIG1fbmVlZHNGdWxsUmVwYWludCA9IHRydWU7 CiAgICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0KSB7CiAgICAgICAgICAgICAgICAg ICAgIFJlbmRlckJveCogcm9vdFJlbmRlcmVyID0gZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50KCkg PyBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQoKS0+cmVuZGVyQm94KCkgOiBudWxscHRyOwpAQCAt MzAxNCw2ICszMDI2LDggQEAgdm9pZCBGcmFtZVZpZXc6OmZsdXNoQW55UGVuZGluZ1Bvc3RMYXlv dXRUYXNrcygpCiAKIHZvaWQgRnJhbWVWaWV3OjpwZXJmb3JtUG9zdExheW91dFRhc2tzKCkKIHsK KyAgICBMT0coTGF5b3V0LCAiRnJhbWVWaWV3ICVwIHBlcmZvcm1Qb3N0TGF5b3V0VGFza3MiLCB0 aGlzKTsKKwogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbm90IHJ1biBhbnkgSmF2YVNjcmlwdCBj b2RlIGluIHRoaXMgZnVuY3Rpb24uCiAKICAgICBtX3Bvc3RMYXlvdXRUYXNrc1RpbWVyLnN0b3Ao KTsKQEAgLTMxNjMsNiArMzE3Nyw4IEBAIHZvaWQgRnJhbWVWaWV3OjphdXRvU2l6ZUlmRW5hYmxl ZCgpCiAgICAgaWYgKG1faW5BdXRvU2l6ZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgTE9HKExh eW91dCwgIkZyYW1lVmlldyAlcCBhdXRvU2l6ZUlmRW5hYmxlZCIsIHRoaXMpOworCiAgICAgVGVt cG9yYXJ5Q2hhbmdlPGJvb2w+IGNoYW5nZUluQXV0b1NpemUobV9pbkF1dG9TaXplLCB0cnVlKTsK IAogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZyYW1lKCkuZG9jdW1lbnQoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0xvZ2dpbmcuaAppbmRleCAyMjhiYzk1MjAzMzI0NjhiYmVjZmE0ZDc0YjcwODVlOGYy MzFiYjFhLi40MDgxOTllZjQ1MmYwNTFhM2VjNDkzYzYzNjdhZjdiNWQ2Yjc2YjI2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2dnaW5nLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vTG9nZ2luZy5oCkBAIC01Myw3ICs1Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICBNKEdhbWVwYWQpIFwKICAgICBNKEhpc3RvcnkpIFwKICAgICBNKEljb25EYXRhYmFz ZSkgXAotICAgIE0oTGl2ZUNvbm5lY3QpIFwKKyAgICBNKExheW91dCkgXAogICAgIE0oTG9hZGlu ZykgXAogICAgIE0oTWVkaWEpIFwKICAgICBNKE1lZGlhU291cmNlKSBcCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYktpdExvZ2dpbmcuaCBiL1NvdXJjZS9XZWJLaXQvbWFj L01pc2MvV2ViS2l0TG9nZ2luZy5oCmluZGV4IDBhMmU1Y2QyZjRhNTA0YTIzNzBlN2RhMjM0NjM4 Y2ZmZDhjY2NhYzAuLmI2MmQxMzNkYTE5N2RlYzY2YWZkMzcwNTQ2YzBjYTQ2MDdkYjI2MmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViS2l0TG9nZ2luZy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViS2l0TG9nZ2luZy5oCkBAIC01Myw3ICs1Myw2IEBAIGV4 dGVybiAiQyIgewogICAgIE0oRm9ybURlbGVnYXRlKSBcCiAgICAgTShIaXN0b3J5KSBcCiAgICAg TShJY29uRGF0YWJhc2UpIFwKLSAgICBNKExpdmVDb25uZWN0KSBcCiAgICAgTShMb2FkaW5nKSBc CiAgICAgTShQYWdlQ2FjaGUpIFwKICAgICBNKFBsdWdpbkV2ZW50cykgXApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW0gYi9T b3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZS5tbQppbmRl eCAwNjMyMzcxNGI4NTMzNDdkNTE2Y2FlYTc3ZWRlNjE5NWVhOWUxYzY4Li43NGJjM2EyOTVkODU3 ODg1NzE3NzJkZjMxMDMyNWFhMDMwZDNmYjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21h Yy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZS5tbQpAQCAtMjU5LDExICsyNTks NiBAQCAtIChCT09MKV90cnlMb2FkCiAgICAgcGx1Z2luU2l6ZSA9IHBsdWdpbkZ1bmNzLnNpemU7 CiAgICAgcGx1Z2luVmVyc2lvbiA9IHBsdWdpbkZ1bmNzLnZlcnNpb247CiAKLSAgICBpZiAocGx1 Z2luRnVuY3MuamF2YUNsYXNzKQotICAgICAgICBMT0coTGl2ZUNvbm5lY3QsICIlQDogIG1hY2gt byBlbnRyeSBwb2ludCBmb3IgTlBQX0dldEphdmFDbGFzcyA9ICVwIiwgKE5TU3RyaW5nICopW3Nl bGYgcGx1Z2luSW5mb10ubmFtZSwgcGx1Z2luRnVuY3MuamF2YUNsYXNzKTsKLSAgICBlbHNlCi0g ICAgICAgIExPRyhMaXZlQ29ubmVjdCwgIiVAOiAgbm8gZW50cnkgcG9pbnQgZm9yIE5QUF9HZXRK YXZhQ2xhc3MiLCAoTlNTdHJpbmcgKilbc2VsZiBwbHVnaW5JbmZvXS5uYW1lKTsKLQogI2lmICFM T0dfRElTQUJMRUQKICAgICBjdXJyZW50VGltZSA9IENGQWJzb2x1dGVUaW1lR2V0Q3VycmVudCgp OwogICAgIGR1cmF0aW9uID0gY3VycmVudFRpbWUgLSBzdGFydDsK