96482 2012-09-12 01:53:11 -0700 Web Inspector: [Styles] Styles not updated when there is a heavy stream of DOM updates 2012-09-12 23:45:46 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 718069 0 apavlov 2012-09-12 01:53:11 -0700 Consider the following call sequence in StylesSidebarPane: 1. this._rebuildUpdateInProgress is false AND there are pending DOM update events in the RPC queue for the Web Inspector frontend. _rebuildUpdate() is invoked, which results in a few WebInspector.cssModel.get*Async() calls (fetching data from the backend). this._rebuildUpdateInProgress is now true. 2. A pending DOM update is processed and is deemed to result in a Styles rebuild. _rebuildUpdate() is called, but since this._rebuildUpdateInProgress is true, this._lastNodeForInnerRebuild is set to this.node. 3. The backend data from the 1st _rebuildUpdate() call are ready, and stylesCallback(matchedResult) is invoked. But, since this._lastNodeForInnerRebuild === this.node, the following snippet is executed: if (this._lastNodeForInnerRebuild) { delete this._lastNodeForInnerRebuild; this._rebuildUpdate(userCallback); return; } This loop goes on forever, until the DOM updates from the backend stop (which may not be the case,) and the Styles pane is never updated. 718269 1 163608 apavlov 2012-09-12 05:50:45 -0700 Created attachment 163608 Patch 718333 2 163624 apavlov 2012-09-12 07:30:44 -0700 Created attachment 163624 Patch 718361 3 163624 vsevik 2012-09-12 08:01:54 -0700 Comment on attachment 163624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163624&action=review > LayoutTests/inspector/styles/force-pseudo-state.html:34 > + InspectorTest.waitForStyles("div", divSelected2, true, 1); I think more readable and flexible approach would be to wait for styles update after each pseudo class change explicitly. Please fix this before landing. 719106 4 apavlov 2012-09-12 23:45:46 -0700 Committed r128407: <http://trac.webkit.org/changeset/128407> 163608 2012-09-12 05:50:45 -0700 2012-09-12 07:30:39 -0700 Patch bug-96482-20120912165018.patch text/plain 8202 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDY5YjkwMDQ2MGI0MjZi NTg0YzMyYjFmNzhiMjk5NGEzMmU3ODMwOC4uZDdhOWNhMTU5NGQwODkwY2FlYTViNTM5ZmRhN2Iz Y2U2MWJiMTk2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEyLTA5LTEyICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1N0eWxlc10gU3R5bGVzIG5vdCB1cGRhdGVkIHdoZW4gdGhlcmUgaXMgYSBoZWF2eSBz dHJlYW0gb2YgRE9NIHVwZGF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk2NDgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXBkYXRlIHRoZSBTdHlsZXMgcGFuZSBldmVuIGlmIHRoZXJlIGlzIGEgcGVu ZGluZyByZWJ1aWxkL3JlZnJlc2ggdXBkYXRlIGZvciB0aGUgc2FtZSBjdXJyZW50IG5vZGUuCisK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZS5fcmVmcmVzaFVw ZGF0ZS5jb21wdXRlZFN0eWxlQ2FsbGJhY2spOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxl c1NpZGViYXJQYW5lLnByb3RvdHlwZS5fcmVmcmVzaFVwZGF0ZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlLl9yZWJ1aWxkVXBkYXRlKToKKworMjAx Mi0wOS0xMiAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFtFbGVtZW50c10gU2lkZWJhciBwYW5lcyBub3QgdXBkYXRlZCBv biBzdHlsZSBjaGFuZ2VzIGR1ZSB0byAiY2xhc3MiIGF0dHJpYnV0ZSBtb2RpZmljYXRpb25zCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTcyMgogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGVi YXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRl YmFyUGFuZS5qcwppbmRleCAwNTM4NTNhMzhiMGM2N2ZjOWE3NjdlZmFhNjEwNzZiMjU1ZjFjYmRl Li5lN2VhYzhjMWFiYjU2NGZlODVmY2JhMDk5OThmMzk4ZmNiM2NjOTBmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUu anMKQEAgLTIwMCw2ICsyMDAsNyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJv dG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3JlZnJlc2hVcGRhdGVJblByb2dy ZXNzKSB7CiAgICAgICAgICAgICB0aGlzLl9sYXN0Tm9kZUZvcklubmVyUmVmcmVzaCA9IHRoaXMu bm9kZTsKKyAgICAgICAgICAgIHRoaXMuX2xhc3RDYWxsYmFja0ZvcklubmVyUmVmcmVzaCA9IHVz ZXJDYWxsYmFjazsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC0yMTEsOSAr MjEyLDEzIEBAIFdlYkluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAg ICAgICAgIHsKICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9yZWZyZXNoVXBkYXRlSW5Qcm9ncmVz czsKIAotICAgICAgICAgICAgaWYgKHRoaXMuX2xhc3ROb2RlRm9ySW5uZXJSZWZyZXNoKSB7Ci0g ICAgICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2xhc3ROb2RlRm9ySW5uZXJSZWZyZXNoOwotICAg ICAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hVcGRhdGUoZWRpdGVkU2VjdGlvbiwgZm9yY2VGZXRj aENvbXB1dGVkU3R5bGUsIHVzZXJDYWxsYmFjayk7CisgICAgICAgICAgICB2YXIgbGFzdE5vZGVG b3JSZWZyZXNoID0gdGhpcy5fbGFzdE5vZGVGb3JJbm5lclJlZnJlc2g7CisgICAgICAgICAgICB2 YXIgbGFzdENhbGxiYWNrRm9yUmVmcmVzaCA9IHRoaXMuX2xhc3RDYWxsYmFja0ZvcklubmVyUmVm cmVzaDsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9sYXN0Tm9kZUZvcklubmVyUmVmcmVzaDsK KyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9sYXN0Q2FsbGJhY2tGb3JJbm5lclJlZnJlc2g7CisK KyAgICAgICAgICAgIGlmIChsYXN0Tm9kZUZvclJlZnJlc2ggJiYgbGFzdE5vZGVGb3JSZWZyZXNo ICE9PSB0aGlzLm5vZGUpIHsKKyAgICAgICAgICAgICAgICB0aGlzLl9yZWZyZXNoVXBkYXRlKGVk aXRlZFNlY3Rpb24sIGZvcmNlRmV0Y2hDb21wdXRlZFN0eWxlLCBsYXN0Q2FsbGJhY2tGb3JSZWZy ZXNoKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKQEAgLTIyMiw2 ICsyMjcsMTIgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsK IAogICAgICAgICAgICAgaWYgKHVzZXJDYWxsYmFjaykKICAgICAgICAgICAgICAgICB1c2VyQ2Fs bGJhY2soKTsKKworICAgICAgICAgICAgaWYgKGxhc3ROb2RlRm9yUmVmcmVzaCkgeworICAgICAg ICAgICAgICAgIC8vIGxhc3ROb2RlRm9yUmVmcmVzaCBpcyB0aGUgc2FtZSBhcyB0aGlzLm5vZGUg LSBhbm90aGVyIHJlZnJlc2ggaGFzIGJlZW4gcmVxdWVzdGVkIHdpdGggYSBkaWZmZXJlbnQgY2Fs bGJhY2suCisgICAgICAgICAgICAgICAgdGhpcy5fcmVmcmVzaFVwZGF0ZShsYXN0Q2FsbGJhY2tG b3JSZWZyZXNoKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CiAgICAg ICAgIH0KIAogICAgICAgICBpZiAodGhpcy5fY29tcHV0ZWRTdHlsZVBhbmUuZXhwYW5kZWQgfHwg Zm9yY2VGZXRjaENvbXB1dGVkU3R5bGUpIHsKQEAgLTIzNCwxNyArMjQ1LDE0IEBAIFdlYkluc3Bl Y3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAog Ci0gICAgLyoqCi0gICAgICogQHBhcmFtIHtmdW5jdGlvbigpPX0gdXNlckNhbGxiYWNrCi0gICAg ICovCi0gICAgX3JlYnVpbGRVcGRhdGU6IGZ1bmN0aW9uKHVzZXJDYWxsYmFjaykKKyAgICBfcmVi dWlsZFVwZGF0ZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3JlYnVpbGRV cGRhdGVJblByb2dyZXNzKSB7CiAgICAgICAgICAgICB0aGlzLl9sYXN0Tm9kZUZvcklubmVyUmVi dWlsZCA9IHRoaXMubm9kZTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAg ICAgIHZhciBub2RlID0gdGhpcy5fdmFsaWRhdGVOb2RlKHVzZXJDYWxsYmFjayk7CisgICAgICAg IHZhciBub2RlID0gdGhpcy5fdmFsaWRhdGVOb2RlKCk7CiAgICAgICAgIGlmICghbm9kZSkKICAg ICAgICAgICAgIHJldHVybjsKIApAQCAtMjU2LDEwICsyNjQsMTMgQEAgV2ViSW5zcGVjdG9yLlN0 eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgewogICAgICAgICAgICAgZGVs ZXRlIHRoaXMuX3JlYnVpbGRVcGRhdGVJblByb2dyZXNzOwogCi0gICAgICAgICAgICBpZiAodGhp cy5fbGFzdE5vZGVGb3JJbm5lclJlYnVpbGQpIHsKKyAgICAgICAgICAgIHZhciBsYXN0Tm9kZUZv clJlYnVpbGQgPSB0aGlzLl9sYXN0Tm9kZUZvcklubmVyUmVidWlsZDsKKyAgICAgICAgICAgIGlm IChsYXN0Tm9kZUZvclJlYnVpbGQpIHsKICAgICAgICAgICAgICAgICBkZWxldGUgdGhpcy5fbGFz dE5vZGVGb3JJbm5lclJlYnVpbGQ7Ci0gICAgICAgICAgICAgICAgdGhpcy5fcmVidWlsZFVwZGF0 ZSh1c2VyQ2FsbGJhY2spOwotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAg ICBpZiAobGFzdE5vZGVGb3JSZWJ1aWxkICE9PSB0aGlzLm5vZGUpIHsKKyAgICAgICAgICAgICAg ICAgICAgdGhpcy5fcmVidWlsZFVwZGF0ZSgpOworICAgICAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAobWF0 Y2hlZFJlc3VsdCAmJiB0aGlzLm5vZGUgPT09IG5vZGUpIHsKQEAgLTI2OCw4ICsyNzksMTIgQEAg V2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg ICAgICByZXN1bHRTdHlsZXMuaW5oZXJpdGVkID0gbWF0Y2hlZFJlc3VsdC5pbmhlcml0ZWQ7CiAg ICAgICAgICAgICAgICAgdGhpcy5faW5uZXJSZWJ1aWxkVXBkYXRlKG5vZGUsIHJlc3VsdFN0eWxl cyk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAodXNlckNhbGxiYWNrKQotICAgICAg ICAgICAgICAgIHVzZXJDYWxsYmFjaygpOworCisgICAgICAgICAgICBpZiAobGFzdE5vZGVGb3JS ZWJ1aWxkKSB7CisgICAgICAgICAgICAgICAgLy8gbGFzdE5vZGVGb3JSZWJ1aWxkIGlzIHRoZSBz YW1lIGFzIHRoaXMubm9kZSAtIGFub3RoZXIgcmVidWlsZCBoYXMgYmVlbiByZXF1ZXN0ZWQuCisg ICAgICAgICAgICAgICAgdGhpcy5fcmVidWlsZFVwZGF0ZSgpOworICAgICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAgICAgIGZ1bmN0aW9uIGlubGlu ZUNhbGxiYWNrKGlubGluZVN0eWxlLCBhdHRyaWJ1dGVzU3R5bGUpCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTZlYmNlZTg2 MTEyN2Y3OTExMGMyZWY4NGVmMmExZTc4MzAxYzM2YS4uOTUyMTQ4NTA3MTdkZDlmMTBkMTgyZjdm ODljZWJhN2VhYWUxZTBmNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEyLTA5LTEyICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1N0eWxlc10gU3R5bGVzIG5vdCB1cGRhdGVkIHdoZW4gdGhlcmUgaXMgYSBoZWF2eSBz dHJlYW0gb2YgRE9NIHVwZGF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk2NDgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzOgorICAg ICAgICAoaW5pdGlhbGl6ZV9FbGVtZW50VGVzdC5JbnNwZWN0b3JUZXN0LndhaXRGb3JTdHlsZXMp OgorICAgICAgICAqIGluc3BlY3Rvci9zdHlsZXMvZm9yY2UtcHNldWRvLXN0YXRlLmh0bWw6CisK KzIwMTItMDktMTIgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KKwog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRWxlbWVudHNdIFNpZGViYXIgcGFuZXMgbm90IHVwZGF0 ZWQgb24gc3R5bGUgY2hhbmdlcyBkdWUgdG8gImNsYXNzIiBhdHRyaWJ1dGUgbW9kaWZpY2F0aW9u cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTU3MjIK IApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMt dGVzdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3Qu anMKaW5kZXggMjcyMjA0NTRhZGRkNGYwZWFkOWM5YmY4YmE2ZDIzYmI0ZWQxZWY2Ni4uOGVlMzhh OTE1Y2I2NmJkNmZiNjY2NzFhYjhjMjliZDc0OTBiNTNjYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qcworKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzCkBAIC02OSwxNSArNjksMjAg QEAgSW5zcGVjdG9yVGVzdC5zZWxlY3ROb2RlV2l0aElkID0gZnVuY3Rpb24oaWRWYWx1ZSwgY2Fs bGJhY2spCiAgICAgSW5zcGVjdG9yVGVzdC5ub2RlV2l0aElkKGlkVmFsdWUsIG9uTm9kZUZvdW5k KTsKIH0KIAotSW5zcGVjdG9yVGVzdC53YWl0Rm9yU3R5bGVzID0gZnVuY3Rpb24oaWRWYWx1ZSwg Y2FsbGJhY2ssIHJlcXVpcmVSZWJ1aWxkKQorSW5zcGVjdG9yVGVzdC53YWl0Rm9yU3R5bGVzID0g ZnVuY3Rpb24oaWRWYWx1ZSwgY2FsbGJhY2ssIHJlcXVpcmVSZWJ1aWxkLCB1cGRhdGVzVG9Ta2lw KQogewogICAgIGNhbGxiYWNrID0gSW5zcGVjdG9yVGVzdC5zYWZlV3JhcChjYWxsYmFjayk7Cisg ICAgdmFyIHVwZGF0ZXNMZWZ0ID0gdXBkYXRlc1RvU2tpcCB8fCAwOwogCiAgICAgKGZ1bmN0aW9u IHNuaWZmKG5vZGUsIHJlYnVpbGQpCiAgICAgewogICAgICAgICBpZiAoKHJlYnVpbGQgfHwgIXJl cXVpcmVSZWJ1aWxkKSAmJiBub2RlICYmIG5vZGUuZ2V0QXR0cmlidXRlKCJpZCIpID09PSBpZFZh bHVlKSB7Ci0gICAgICAgICAgICBjYWxsYmFjaygpOwotICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgaWYgKHVwZGF0ZXNMZWZ0KQorICAgICAgICAgICAgICAgIC0tdXBkYXRlc0xlZnQ7 CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBjYWxsYmFjaygpOworICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQYW5lLnByb3Rv dHlwZSwgIl9ub2RlU3R5bGVzVXBkYXRlZEZvclRlc3QiLCBzbmlmZik7CiAgICAgfSkobnVsbCk7 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2ZvcmNlLXBzZXVkby1z dGF0ZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3N0eWxlcy9mb3JjZS1wc2V1ZG8tc3Rh dGUuaHRtbAppbmRleCBlOTVlNDYxOTZkMzJmYmVkMGFjZGYwYWUzZTZiZjNhYWEyOTA2ZTg5Li5k OGIzZmFkZTU2Y2Y3ZDE3N2VjYzc1NTRjNTc2NWE3YmU3Y2VkNDdlIDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2ZvcmNlLXBzZXVkby1zdGF0ZS5odG1sCisrKyBiL0xh eW91dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvZm9yY2UtcHNldWRvLXN0YXRlLmh0bWwKQEAgLTMx LDkgKzMxLDkgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVz dWx0KCIiKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkRJViB3aXRoIDpob3Zl ciBhbmQgOmFjdGl2ZSIpOwogICAgICAgICBkdW1wRGF0YSgpOworICAgICAgICBJbnNwZWN0b3JU ZXN0LndhaXRGb3JTdHlsZXMoImRpdiIsIGRpdlNlbGVjdGVkMiwgdHJ1ZSwgMSk7CiAgICAgICAg IFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMuX3NldFBzZXVkb0NsYXNzRm9yTm9kZUlkKGRp dk5vZGVJZCwgImhvdmVyIiwgZmFsc2UpOwogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLmVs ZW1lbnRzLl9zZXRQc2V1ZG9DbGFzc0Zvck5vZGVJZChkaXZOb2RlSWQsICJmb2N1cyIsIHRydWUp OwotICAgICAgICBJbnNwZWN0b3JUZXN0LndhaXRGb3JTdHlsZXMoImRpdiIsIGRpdlNlbGVjdGVk MiwgdHJ1ZSk7CiAgICAgfQogCiAgICAgZnVuY3Rpb24gZGl2U2VsZWN0ZWQyKCkKQEAgLTQxLDkg KzQxLDkgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0 KCIiKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIkRJViB3aXRoIDphY3RpdmUg YW5kIDpmb2N1cyIpOwogICAgICAgICBkdW1wRGF0YSgpOworICAgICAgICBJbnNwZWN0b3JUZXN0 LndhaXRGb3JTdHlsZXMoImRpdiIsIGRpdlNlbGVjdGVkMywgdHJ1ZSwgMSk7CiAgICAgICAgIFdl Ykluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMuX3NldFBzZXVkb0NsYXNzRm9yTm9kZUlkKGRpdk5v ZGVJZCwgImZvY3VzIiwgZmFsc2UpOwogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLmVsZW1l bnRzLl9zZXRQc2V1ZG9DbGFzc0Zvck5vZGVJZChkaXZOb2RlSWQsICJhY3RpdmUiLCBmYWxzZSk7 Ci0gICAgICAgIEluc3BlY3RvclRlc3Qud2FpdEZvclN0eWxlcygiZGl2IiwgZGl2U2VsZWN0ZWQz LCB0cnVlKTsKICAgICB9CiAKICAgICBmdW5jdGlvbiBkaXZTZWxlY3RlZDMobm9kZSkK 163624 2012-09-12 07:30:44 -0700 2012-09-12 08:01:53 -0700 Patch bug-96482-20120912183017.patch text/plain 6473 apavlov U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4MjkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDY5YjkwMDQ2MGI0MjZi NTg0YzMyYjFmNzhiMjk5NGEzMmU3ODMwOC4uYzk3N2QzMDQ4NGY4OTcwZTBjNjJiZDc2YzViMWE1 MzkwZDgzZmJhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDEyLTA5LTEyICBBbGV4 YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogW1N0eWxlc10gU3R5bGVzIG5vdCB1cGRhdGVkIHdoZW4gdGhlcmUgaXMgYSBoZWF2eSBz dHJlYW0gb2YgRE9NIHVwZGF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk2NDgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXBkYXRlIHRoZSBTdHlsZXMgcGFuZSBldmVuIGlmIHRoZXJlIGlzIGEgcGVu ZGluZyByZWJ1aWxkIHVwZGF0ZSBmb3IgdGhlIHNhbWUgY3VycmVudCBub2RlLgorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TdHlsZXNTaWRlYmFyUGFuZS5wcm90b3R5cGUuX3JlYnVpbGRVcGRhdGUpOgor CisyMDEyLTA5LTEyICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisK ICAgICAgICAgV2ViIEluc3BlY3RvcjogW0VsZW1lbnRzXSBTaWRlYmFyIHBhbmVzIG5vdCB1cGRh dGVkIG9uIHN0eWxlIGNoYW5nZXMgZHVlIHRvICJjbGFzcyIgYXR0cmlidXRlIG1vZGlmaWNhdGlv bnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NzIy CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVz U2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxl c1NpZGViYXJQYW5lLmpzCmluZGV4IDA1Mzg1M2EzOGIwYzY3ZmM5YTc2N2VmYWE2MTA3NmIyNTVm MWNiZGUuLmFmMTNmNDE4OTc1ZDUwMjQ1NjFmM2QwNjM0YjcxZWIxYTYxNTM4M2QgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFy UGFuZS5qcwpAQCAtMjM0LDE3ICsyMzQsMTQgQEAgV2ViSW5zcGVjdG9yLlN0eWxlc1NpZGViYXJQ YW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICAvKioKLSAgICAgKiBA cGFyYW0ge2Z1bmN0aW9uKCk9fSB1c2VyQ2FsbGJhY2sKLSAgICAgKi8KLSAgICBfcmVidWlsZFVw ZGF0ZTogZnVuY3Rpb24odXNlckNhbGxiYWNrKQorICAgIF9yZWJ1aWxkVXBkYXRlOiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fcmVidWlsZFVwZGF0ZUluUHJvZ3Jlc3MpIHsK ICAgICAgICAgICAgIHRoaXMuX2xhc3ROb2RlRm9ySW5uZXJSZWJ1aWxkID0gdGhpcy5ub2RlOwog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIG5vZGUgPSB0aGlz Ll92YWxpZGF0ZU5vZGUodXNlckNhbGxiYWNrKTsKKyAgICAgICAgdmFyIG5vZGUgPSB0aGlzLl92 YWxpZGF0ZU5vZGUoKTsKICAgICAgICAgaWYgKCFub2RlKQogICAgICAgICAgICAgcmV0dXJuOwog CkBAIC0yNTYsMTAgKzI1MywxMyBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJv dG90eXBlID0gewogICAgICAgICB7CiAgICAgICAgICAgICBkZWxldGUgdGhpcy5fcmVidWlsZFVw ZGF0ZUluUHJvZ3Jlc3M7CiAKLSAgICAgICAgICAgIGlmICh0aGlzLl9sYXN0Tm9kZUZvcklubmVy UmVidWlsZCkgeworICAgICAgICAgICAgdmFyIGxhc3ROb2RlRm9yUmVidWlsZCA9IHRoaXMuX2xh c3ROb2RlRm9ySW5uZXJSZWJ1aWxkOworICAgICAgICAgICAgaWYgKGxhc3ROb2RlRm9yUmVidWls ZCkgewogICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9sYXN0Tm9kZUZvcklubmVyUmVidWls ZDsKLSAgICAgICAgICAgICAgICB0aGlzLl9yZWJ1aWxkVXBkYXRlKHVzZXJDYWxsYmFjayk7Ci0g ICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIGlmIChsYXN0Tm9kZUZvclJl YnVpbGQgIT09IHRoaXMubm9kZSkgeworICAgICAgICAgICAgICAgICAgICB0aGlzLl9yZWJ1aWxk VXBkYXRlKCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChtYXRjaGVkUmVzdWx0ICYmIHRoaXMu bm9kZSA9PT0gbm9kZSkgewpAQCAtMjY4LDggKzI2OCwxMiBAQCBXZWJJbnNwZWN0b3IuU3R5bGVz U2lkZWJhclBhbmUucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHJlc3VsdFN0eWxlcy5p bmhlcml0ZWQgPSBtYXRjaGVkUmVzdWx0LmluaGVyaXRlZDsKICAgICAgICAgICAgICAgICB0aGlz Ll9pbm5lclJlYnVpbGRVcGRhdGUobm9kZSwgcmVzdWx0U3R5bGVzKTsKICAgICAgICAgICAgIH0K LSAgICAgICAgICAgIGlmICh1c2VyQ2FsbGJhY2spCi0gICAgICAgICAgICAgICAgdXNlckNhbGxi YWNrKCk7CisKKyAgICAgICAgICAgIGlmIChsYXN0Tm9kZUZvclJlYnVpbGQpIHsKKyAgICAgICAg ICAgICAgICAvLyBsYXN0Tm9kZUZvclJlYnVpbGQgaXMgdGhlIHNhbWUgYXMgdGhpcy5ub2RlIC0g YW5vdGhlciByZWJ1aWxkIGhhcyBiZWVuIHJlcXVlc3RlZC4KKyAgICAgICAgICAgICAgICB0aGlz Ll9yZWJ1aWxkVXBkYXRlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAg fQogICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gaW5saW5lQ2FsbGJhY2soaW5saW5lU3R5 bGUsIGF0dHJpYnV0ZXNTdHlsZSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBhNmViY2VlODYxMTI3Zjc5MTEwYzJlZjg0ZWYy YTFlNzgzMDFjMzZhLi45NTIxNDg1MDcxN2RkOWYxMGQxODJmN2Y4OWNlYmE3ZWFhZTFlMGY2IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTItMDktMTIgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2 bG92QGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBbU3R5bGVzXSBTdHls ZXMgbm90IHVwZGF0ZWQgd2hlbiB0aGVyZSBpcyBhIGhlYXZ5IHN0cmVhbSBvZiBET00gdXBkYXRl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY0ODIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAv dGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzLXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0Vs ZW1lbnRUZXN0Lkluc3BlY3RvclRlc3Qud2FpdEZvclN0eWxlcyk6CisgICAgICAgICogaW5zcGVj dG9yL3N0eWxlcy9mb3JjZS1wc2V1ZG8tc3RhdGUuaHRtbDoKKworMjAxMi0wOS0xMiAgQWxleGFu ZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtFbGVtZW50c10gU2lkZWJhciBwYW5lcyBub3QgdXBkYXRlZCBvbiBzdHlsZSBjaGFuZ2Vz IGR1ZSB0byAiY2xhc3MiIGF0dHJpYnV0ZSBtb2RpZmljYXRpb25zCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTcyMgogCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9lbGVtZW50cy10ZXN0LmpzIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMtdGVzdC5qcwppbmRleCAyNzIyMDQ1NGFk ZGQ0ZjBlYWQ5YzliZjhiYTZkMjNiYjRlZDFlZjY2Li44ZWUzOGE5MTVjYjY2YmQ2ZmI2NjY3MWFi OGMyOWJkNzQ5MGI1M2NhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3Bl Y3Rvci9lbGVtZW50cy10ZXN0LmpzCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVj dG9yL2VsZW1lbnRzLXRlc3QuanMKQEAgLTY5LDE1ICs2OSwyMCBAQCBJbnNwZWN0b3JUZXN0LnNl bGVjdE5vZGVXaXRoSWQgPSBmdW5jdGlvbihpZFZhbHVlLCBjYWxsYmFjaykKICAgICBJbnNwZWN0 b3JUZXN0Lm5vZGVXaXRoSWQoaWRWYWx1ZSwgb25Ob2RlRm91bmQpOwogfQogCi1JbnNwZWN0b3JU ZXN0LndhaXRGb3JTdHlsZXMgPSBmdW5jdGlvbihpZFZhbHVlLCBjYWxsYmFjaywgcmVxdWlyZVJl YnVpbGQpCitJbnNwZWN0b3JUZXN0LndhaXRGb3JTdHlsZXMgPSBmdW5jdGlvbihpZFZhbHVlLCBj YWxsYmFjaywgcmVxdWlyZVJlYnVpbGQsIHVwZGF0ZXNUb1NraXApCiB7CiAgICAgY2FsbGJhY2sg PSBJbnNwZWN0b3JUZXN0LnNhZmVXcmFwKGNhbGxiYWNrKTsKKyAgICB2YXIgdXBkYXRlc0xlZnQg PSB1cGRhdGVzVG9Ta2lwIHx8IDA7CiAKICAgICAoZnVuY3Rpb24gc25pZmYobm9kZSwgcmVidWls ZCkKICAgICB7CiAgICAgICAgIGlmICgocmVidWlsZCB8fCAhcmVxdWlyZVJlYnVpbGQpICYmIG5v ZGUgJiYgbm9kZS5nZXRBdHRyaWJ1dGUoImlkIikgPT09IGlkVmFsdWUpIHsKLSAgICAgICAgICAg IGNhbGxiYWNrKCk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICBpZiAodXBkYXRl c0xlZnQpCisgICAgICAgICAgICAgICAgLS11cGRhdGVzTGVmdDsKKyAgICAgICAgICAgIGVsc2Ug eworICAgICAgICAgICAgICAgIGNhbGxiYWNrKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkU25pZmZl cihXZWJJbnNwZWN0b3IuU3R5bGVzU2lkZWJhclBhbmUucHJvdG90eXBlLCAiX25vZGVTdHlsZXNV cGRhdGVkRm9yVGVzdCIsIHNuaWZmKTsKICAgICB9KShudWxsKTsKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2luc3BlY3Rvci9zdHlsZXMvZm9yY2UtcHNldWRvLXN0YXRlLmh0bWwgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3Ivc3R5bGVzL2ZvcmNlLXBzZXVkby1zdGF0ZS5odG1sCmluZGV4IGU5NWU0 NjE5NmQzMmZiZWQwYWNkZjBhZTNlNmJmM2FhYTI5MDZlODkuLmQ4YjNmYWRlNTZjZjdkMTc3ZWNj NzU1NGM1NzY1YTdiZTdjZWQ0N2UgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9z dHlsZXMvZm9yY2UtcHNldWRvLXN0YXRlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L3N0eWxlcy9mb3JjZS1wc2V1ZG8tc3RhdGUuaHRtbApAQCAtMzEsOSArMzEsOSBAQCBmdW5jdGlv biB0ZXN0KCkKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiIpOwogICAgICAgICBJ bnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiRElWIHdpdGggOmhvdmVyIGFuZCA6YWN0aXZlIik7CiAg ICAgICAgIGR1bXBEYXRhKCk7CisgICAgICAgIEluc3BlY3RvclRlc3Qud2FpdEZvclN0eWxlcygi ZGl2IiwgZGl2U2VsZWN0ZWQyLCB0cnVlLCAxKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVs cy5lbGVtZW50cy5fc2V0UHNldWRvQ2xhc3NGb3JOb2RlSWQoZGl2Tm9kZUlkLCAiaG92ZXIiLCBm YWxzZSk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMuX3NldFBzZXVkb0Ns YXNzRm9yTm9kZUlkKGRpdk5vZGVJZCwgImZvY3VzIiwgdHJ1ZSk7Ci0gICAgICAgIEluc3BlY3Rv clRlc3Qud2FpdEZvclN0eWxlcygiZGl2IiwgZGl2U2VsZWN0ZWQyLCB0cnVlKTsKICAgICB9CiAK ICAgICBmdW5jdGlvbiBkaXZTZWxlY3RlZDIoKQpAQCAtNDEsOSArNDEsOSBAQCBmdW5jdGlvbiB0 ZXN0KCkKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIiIpOwogICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgiRElWIHdpdGggOmFjdGl2ZSBhbmQgOmZvY3VzIik7CiAgICAg ICAgIGR1bXBEYXRhKCk7CisgICAgICAgIEluc3BlY3RvclRlc3Qud2FpdEZvclN0eWxlcygiZGl2 IiwgZGl2U2VsZWN0ZWQzLCB0cnVlLCAxKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5l bGVtZW50cy5fc2V0UHNldWRvQ2xhc3NGb3JOb2RlSWQoZGl2Tm9kZUlkLCAiZm9jdXMiLCBmYWxz ZSk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuZWxlbWVudHMuX3NldFBzZXVkb0NsYXNz Rm9yTm9kZUlkKGRpdk5vZGVJZCwgImFjdGl2ZSIsIGZhbHNlKTsKLSAgICAgICAgSW5zcGVjdG9y VGVzdC53YWl0Rm9yU3R5bGVzKCJkaXYiLCBkaXZTZWxlY3RlZDMsIHRydWUpOwogICAgIH0KIAog ICAgIGZ1bmN0aW9uIGRpdlNlbGVjdGVkMyhub2RlKQo=