78895 2012-02-17 05:50:02 -0800 Web Inspector: check undo-redo boundaries based on current action index, not history size. 2012-02-17 08:14:17 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 559142 0 pfeldman 2012-02-17 05:50:02 -0800 Patch to follow. 559144 1 127577 pfeldman 2012-02-17 05:51:40 -0800 Created attachment 127577 Patch 559200 2 127577 vsevik 2012-02-17 08:01:48 -0800 Comment on attachment 127577 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127577&action=review > Source/WebCore/inspector/InspectorHistory.cpp:93 > + if (!action->mergeId().isEmpty() && m_afterLastActionIndex > 0 && m_afterLastActionIndex < m_history.size() && action->mergeId() == m_history[m_afterLastActionIndex - 1]->mergeId()) Please remove second condition 559204 3 pfeldman 2012-02-17 08:14:17 -0800 Committed r108075: <http://trac.webkit.org/changeset/108075> 127577 2012-02-17 05:51:40 -0800 2012-02-17 08:01:48 -0800 Patch bug-78895-20120217175138.patch text/plain 5125 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4MDY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTdiYTFkZWQzNmRkYjRh OWM1MjY0YjE0NGE4OGUxOWIyYjBhMzI2MC4uMjMyNjJjYTZkY2E4OWQyYzlhNDg0MGY1MGI1MTc2 MDBhMDhhNTg1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDEyLTAyLTE3ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBjaGVjayB1bmRvLXJlZG8gYm91bmRhcmllcyBiYXNlZCBvbiBjdXJyZW50IGFjdGlvbiBpbmRl eCwgbm90IGhpc3Rvcnkgc2l6ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc4ODk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL2VsZW1lbnRzL3BlcmZvcm0tdW5kby11bmRvLmh0 bWwKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JIaXN0b3J5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3Rvckhpc3Rvcnk6OnBlcmZvcm0pOgorCisyMDEyLTAyLTE3ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9y OiBhIGJpdCBvZiBjb2xvciBwaWNrZXIgcG9saXNoCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODg5MgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySGlzdG9yeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9ySGlzdG9yeS5jcHAKaW5kZXggMzkzY2JhNTk4ZDMwZTI3MGZkMDUzODUwMjU3 YjI3NTlmODQ0NjJhMy4uMjQ4MDMxNjQ4MTAyNTdhODNlNzBlYTJjODUxNzY5ZjA5MDk4ZjI3MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckhpc3RvcnkuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JIaXN0b3J5LmNwcApAQCAt OTAsNyArOTAsNyBAQCBib29sIEluc3BlY3Rvckhpc3Rvcnk6OnBlcmZvcm0oUGFzc093blB0cjxB Y3Rpb24+IGFjdGlvbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiAgICAgaWYgKCFhY3Rpb24tPnBlcmZv cm0oZWMpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIW1faGlzdG9yeS5pc0Vt cHR5KCkgJiYgIWFjdGlvbi0+bWVyZ2VJZCgpLmlzRW1wdHkoKSAmJiBhY3Rpb24tPm1lcmdlSWQo KSA9PSBtX2hpc3RvcnlbbV9hZnRlckxhc3RBY3Rpb25JbmRleCAtIDFdLT5tZXJnZUlkKCkpCisg ICAgaWYgKCFhY3Rpb24tPm1lcmdlSWQoKS5pc0VtcHR5KCkgJiYgbV9hZnRlckxhc3RBY3Rpb25J bmRleCA+IDAgJiYgbV9hZnRlckxhc3RBY3Rpb25JbmRleCA8IG1faGlzdG9yeS5zaXplKCkgJiYg YWN0aW9uLT5tZXJnZUlkKCkgPT0gbV9oaXN0b3J5W21fYWZ0ZXJMYXN0QWN0aW9uSW5kZXggLSAx XS0+bWVyZ2VJZCgpKQogICAgICAgICBtX2hpc3RvcnlbbV9hZnRlckxhc3RBY3Rpb25JbmRleCAt IDFdLT5tZXJnZShhY3Rpb24pOwogICAgIGVsc2UgewogICAgICAgICBtX2hpc3RvcnkucmVzaXpl KG1fYWZ0ZXJMYXN0QWN0aW9uSW5kZXgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGRlNTZhNThmODE0ZmZhZjFhNTNhNDVm ODM3NzZmZmVhNjg2Y2I4MjQuLjA4YjhhOWZhNTU2NDY0OGU1MDA2ZDVmZWE2MTA4MjQ0YTgzYWJi ZmEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wMi0xNyAgUGF2ZWwgRmVsZG1hbiAgPHBm ZWxkbWFuQGdvb2dsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogY2hlY2sgdW5kby1y ZWRvIGJvdW5kYXJpZXMgYmFzZWQgb24gY3VycmVudCBhY3Rpb24gaW5kZXgsIG5vdCBoaXN0b3J5 IHNpemUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 ODg5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2VsZW1lbnRzL3BlcmZvcm0tdW5kby11bmRvLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogaW5zcGVjdG9yL2VsZW1lbnRzL3BlcmZvcm0tdW5kby11bmRvLmh0bWw6IEFk ZGVkLgorCiAyMDEyLTAyLTE3ICBOb2VsIEdvcmRvbiAgPG5vZWwuZ29yZG9uQGdtYWlsLmNvbT4K IAogICAgICAgICBbY2hyb21pdW1dIFJlYmFzZWxpbmUgSlBFRyBpbWFnZSByZXN1bHRzIGFmdGVy IHIxMDczODkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9lbGVtZW50cy9wZXJm b3JtLXVuZG8tdW5kby1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVu dHMvcGVyZm9ybS11bmRvLXVuZG8tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE1N2M4ZDkxYzNi ZjUwMWM0NTJmYjNhZTlkYzY0MDIzZTQ2Mjk0YzYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvcGVyZm9ybS11bmRvLXVuZG8tZXhwZWN0ZWQudHh0CkBA IC0wLDAgKzEsMTEgQEAKK1Rlc3RzIHRoYXQgY2xpZW50IGNhbiBjYWxsIHVuZG8gbXVsdGlwbGUg dGltZXMgd2l0aCBub24tZW1wdHkgaGlzdG9yeS4KKworPT09PT09PT09IE9yaWdpbmFsID09PT09 PT09CisgIDxkaXYgc3R5bGU9ImRpc3BsYXk6bm9uZSIgaWQ9ImNvbnRhaW5lciI+PC9kaXY+Cis9 PT09PSBNb2RpZmllZCBlbGVtZW50ID09PT09CisgIDxkaXYgc3R5bGU9ImRpc3BsYXk6bm9uZSIg aWQ9ImNvbnRhaW5lciIgZm9vPSJiYXIiPjwvZGl2PgorPT09PT0gVW5kbyAxID09PT09CisgIDxk aXYgc3R5bGU9ImRpc3BsYXk6bm9uZSIgaWQ9ImNvbnRhaW5lciI+PC9kaXY+Cis9PT09PSBVbmRv IDIgPT09PT0KKyAgPGRpdiBzdHlsZT0iZGlzcGxheTpub25lIiBpZD0iY29udGFpbmVyIj48L2Rp dj4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1lbnRzL3BlcmZvcm0t dW5kby11bmRvLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZWxlbWVudHMvcGVyZm9ybS11 bmRvLXVuZG8uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zYjcwMWIyZjNmNGVkMzFjYTBmMTNjZDlkOWRiYTE4 NDY5ODMxYjA2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2VsZW1l bnRzL3BlcmZvcm0tdW5kby11bmRvLmh0bWwKQEAgLTAsMCArMSw2NiBAQAorPGh0bWw+Cis8aGVh ZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9pbnNwZWN0b3ItdGVz dC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0b3Iv ZWxlbWVudHMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorCitmdW5jdGlvbiB0ZXN0KCkK K3sKKyAgICB2YXIgY29udGFpbmVyTm9kZTsKKyAgICBJbnNwZWN0b3JUZXN0LmV4cGFuZEVsZW1l bnRzVHJlZShzdGVwMSk7CisKKyAgICBmdW5jdGlvbiBzdGVwMShub2RlKQorICAgIHsKKyAgICAg ICAgY29udGFpbmVyTm9kZSA9IEluc3BlY3RvclRlc3QuZXhwYW5kZWROb2RlV2l0aElkKCJjb250 YWluZXIiKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIj09PT09PT09PSBPcmln aW5hbCA9PT09PT09PSIpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBFbGVtZW50c1RyZWUo Y29udGFpbmVyTm9kZSk7CisgICAgICAgIHN0ZXAyKCk7CisgICAgfQorCisgICAgZnVuY3Rpb24g c3RlcDIoKQorICAgIHsKKyAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2soKQorICAgICAgICB7Cisg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiPT09PT0gTW9kaWZpZWQgZWxlbWVu dCA9PT09PSIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wRWxlbWVudHNUcmVlKGNv bnRhaW5lck5vZGUpOworICAgICAgICAgICAgc3RlcDMoKTsKKyAgICAgICAgfQorICAgICAgICBj b250YWluZXJOb2RlLnNldEF0dHJpYnV0ZSgiIiwgImZvbz1cImJhclwiIiwgY2FsbGJhY2spOwor ICAgIH0KKworICAgIGZ1bmN0aW9uIHN0ZXAzKCkKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIGNh bGxiYWNrKCkKKyAgICAgICAgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQo Ij09PT09IFVuZG8gMSA9PT09PSIpOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wRWxl bWVudHNUcmVlKGNvbnRhaW5lck5vZGUpOworICAgICAgICAgICAgc3RlcDQoKTsKKyAgICAgICAg fQorICAgICAgICBXZWJJbnNwZWN0b3IuZG9tQWdlbnQudW5kbyhjYWxsYmFjayk7CisgICAgfQor CisgICAgZnVuY3Rpb24gc3RlcDQoKQorICAgIHsKKyAgICAgICAgZnVuY3Rpb24gY2FsbGJhY2so KQorICAgICAgICB7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiPT09PT0g VW5kbyAyID09PT09Iik7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBFbGVtZW50c1Ry ZWUoY29udGFpbmVyTm9kZSk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVz dCgpOworICAgICAgICB9CisgICAgICAgIFdlYkluc3BlY3Rvci5kb21BZ2VudC51bmRvKGNhbGxi YWNrKTsKKyAgICB9Cit9CisKKzwvc2NyaXB0PgorPC9oZWFkPgorCis8Ym9keSBvbmxvYWQ9InJ1 blRlc3QoKSI+Cis8cD4KK1Rlc3RzIHRoYXQgY2xpZW50IGNhbiBjYWxsIHVuZG8gbXVsdGlwbGUg dGltZXMgd2l0aCBub24tZW1wdHkgaGlzdG9yeS4KKzwvcD4KKworPGRpdiBzdHlsZT0iZGlzcGxh eTpub25lIiBpZD0iY29udGFpbmVyIj4KKzwvZGl2PgorCis8L2JvZHk+Cis8L2h0bWw+Cg==