6770 2006-01-24 13:20:40 -0800 REGRESSION: Incomplete repaint when block with clipping grows 2006-04-19 19:48:01 -0700 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 RESOLVED FIXED HasReduction, InRadar, Regression P1 Normal --- 1 mitz webkit-unassigned alice.barraclough hyatt oldest_to_newest 29738 0 mitz 2006-01-24 13:20:40 -0800 See the attached testcase. In this case, since the block with the border grows and repaints before its container (which is clipping) grows, so in RenderObject::repaintAfterLayoutIfNeeded it sees that its old bounds are equal to its new bounds and it doesn't repaint. When the container repaints, it paints only the delta, so the old border of the inner block isn't erased. 29739 1 5926 mitz 2006-01-24 13:22:00 -0800 Created attachment 5926 Testcase 36999 2 alice.barraclough 2006-03-20 06:47:53 -0800 <rdar://problem/4483838> 39438 3 7750 mitz 2006-04-16 14:07:41 -0700 Created attachment 7750 Possible fix I think this patch does not add a lot of painting, and what it does add can be divided between 1) what's needed to fix the bug: the layer did not need layout, but ended up resizing because of a child. 2) addressing the fact that the selfNeedsLayout() condition in repaintAfterLayoutIfNeeded() is always false when called from the layer. 39439 4 7751 mitz 2006-04-16 15:36:15 -0700 Created attachment 7751 Possible fix Please see my previous comment. 39441 5 7752 mitz 2006-04-16 15:37:54 -0700 Created attachment 7752 Possible fix Sorry, uploaded the wrong file. 39453 6 7752 darin 2006-04-16 19:39:54 -0700 Comment on attachment 7752 Possible fix This sure looks good to me, but I think it's something Hyatt will want to review himself. 39548 7 hyatt 2006-04-17 14:12:04 -0700 Won't this cause way too much repainting? Turn on paint flashing and try loading a huge file like: http://lxr.mozilla.org/seamonkey/source/layout/base/nsCSSFrameConstructor.cpp Do you see the whole window repainting now with this fix as chunks of data come in? It seems like this fix will cause the root block's layer to repaint whenever new chunks of data come in that make the root block's layer grow. 39561 8 mitz 2006-04-17 15:00:26 -0700 (In reply to comment #7) > It seems like this fix will cause the root block's layer to repaint whenever > new chunks of data come in that make the root block's layer grow. Oh boy, I overlooked that! I think instead of + m_fullRepaintOnResize = m_object->selfNeedsLayout() || m_object->normalChildNeedsLayout(); it should be + m_fullRepaintOnResize = m_object->selfNeedsLayout() || m_object->hasOverflowClip() && m_object->normalChildNeedsLayout(); 39575 9 7752 hyatt 2006-04-17 17:39:55 -0700 Comment on attachment 7752 Possible fix Even that change will still cause overflow blocks to repaint over and over as they load content. 39595 10 mitz 2006-04-18 01:13:06 -0700 (In reply to comment #9) > (From update of attachment 7752 [edit]) > Even that change will still cause overflow blocks to repaint over and over as > they load content. In what case, other than when adding content causes their layer to resize (which is what this bug is about)? 39635 11 7810 mitz 2006-04-18 14:15:56 -0700 Created attachment 7810 Patch, including change log and manual test Added the hasOverflowClip() check and renamed the flag per Hyatt's suggestion. 39636 12 7810 hyatt 2006-04-18 14:17:30 -0700 Comment on attachment 7810 Patch, including change log and manual test r=me 39897 13 timothy 2006-04-19 19:48:01 -0700 Landed in r13982. 5926 2006-01-24 13:22:00 -0800 2006-01-24 13:22:00 -0800 Testcase 6770 testcase.html text/html 401 mitz PHA+UHJlc3MgdGhlIEdyb3cgYnV0dG9uLCB0aGVuIGZvcmNlIHJlcGFpbnQgYnkgY2hvb3Npbmcg RWRpdCA+IFNlbGVjdCBBbGw8L3A+IAo8YnV0dG9uIG9uY2xpY2s9InQuc3R5bGUuaGVpZ2h0PSc2 MCciPkdyb3c8L2J1dHRvbj4KPGJ1dHRvbiBvbmNsaWNrPSJ0LnN0eWxlLmhlaWdodD0nMTAnIj5T aHJpbms8L2J1dHRvbj4KPGRpdiBzdHlsZT0ib3ZlcmZsb3c6IGhpZGRlbjsiPgogICAgPGRpdiBz dHlsZT0iYm9yZGVyOiA0cHggc29saWQgYmx1ZTsgd2lkdGg6IDEwMHB4OyI+CiAgICAgICAgPGRp diBpZD0idCIgc3R5bGU9IndpZHRoOiAxMHB4OyBoZWlnaHQ6IDEwcHg7IGJhY2tncm91bmQ6IHBp bms7Ij48L2Rpdj4KICAgIDwvZGl2Pgo8L2Rpdj4KJm5ic3A7PCEtLSBmb3Igc2VsZWN0aW9uIC0t Pgo= 7750 2006-04-16 14:07:41 -0700 2006-04-16 15:36:15 -0700 Possible fix 6770_r0.patch text/plain 2791 mitz SW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDEzODgwKQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzgsNiAr MTM4LDcgQEAgbV9vdmVyZmxvd0xpc3REaXJ0eSh0cnVlKSwKIG1faXNPdmVyZmxvd09ubHkoc2hv dWxkQmVPdmVyZmxvd09ubHkoKSksCiBtX3VzZWRUcmFuc3BhcmVuY3koZmFsc2UpLAogbV9pbk92 ZXJmbG93UmVsYXlvdXQoZmFsc2UpLAorbV9mdWxsUmVwYWludE9uR3JvdyhmYWxzZSksCiBtX21h cnF1ZWUoMCkKIHsKIH0KQEAgLTE2MSw2ICsxNjIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjb21w dXRlUmVwYWludFJlY3RzKCkKIHsKICAgICAvLyBGSVhNRTogQ2hpbGQgb2JqZWN0IGNvdWxkIG92 ZXJyaWRlIHZpc2liaWxpdHkuCiAgICAgaWYgKG1fb2JqZWN0LT5zdHlsZSgpLT52aXNpYmlsaXR5 KCkgPT0gVklTSUJMRSkgeworICAgICAgICBtX2Z1bGxSZXBhaW50T25Hcm93ID0gbV9vYmplY3Qt PnNlbGZOZWVkc0xheW91dCgpIHx8IG1fb2JqZWN0LT5ub3JtYWxDaGlsZE5lZWRzTGF5b3V0KCk7 CiAgICAgICAgIG1fb2JqZWN0LT5nZXRBYnNvbHV0ZVJlcGFpbnRSZWN0SW5jbHVkaW5nRmxvYXRz KG1fcmVwYWludFJlY3QsIG1fZnVsbFJlcGFpbnRSZWN0KTsKICAgICAgICAgbV9vYmplY3QtPmFi c29sdXRlUG9zaXRpb24obV9yZXBhaW50WCwgbV9yZXBhaW50WSk7CiAgICAgfQpAQCAtMTkwLDE1 ICsxOTIsMjIgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnMoYgogCiAg ICAgLy8gRklYTUU6IENoaWxkIG9iamVjdCBjb3VsZCBvdmVycmlkZSB2aXNpYmlsaXR5LgogICAg IGlmIChjaGVja0ZvclJlcGFpbnQgJiYgKG1fb2JqZWN0LT5zdHlsZSgpLT52aXNpYmlsaXR5KCkg PT0gVklTSUJMRSkpIHsKLSAgICAgICAgaW50IHgsIHk7Ci0gICAgICAgIG1fb2JqZWN0LT5hYnNv bHV0ZVBvc2l0aW9uKHgsIHkpOwotICAgICAgICBpZiAoeCA9PSBtX3JlcGFpbnRYICYmIHkgPT0g bV9yZXBhaW50WSkKLSAgICAgICAgICAgIG1fb2JqZWN0LT5yZXBhaW50QWZ0ZXJMYXlvdXRJZk5l ZWRlZChtX3JlcGFpbnRSZWN0LCBtX2Z1bGxSZXBhaW50UmVjdCk7Ci0gICAgICAgIGVsc2Ugewot ICAgICAgICAgICAgUmVuZGVyQ2FudmFzICpjID0gbV9vYmplY3QtPmNhbnZhcygpOwotICAgICAg ICAgICAgaWYgKGMgJiYgIWMtPnByaW50aW5nTW9kZSgpKSB7CisgICAgICAgIFJlbmRlckNhbnZh cyAqYyA9IG1fb2JqZWN0LT5jYW52YXMoKTsKKyAgICAgICAgaWYgKGMgJiYgIWMtPnByaW50aW5n TW9kZSgpKSB7CisgICAgICAgICAgICBpbnQgeCwgeTsKKyAgICAgICAgICAgIG1fb2JqZWN0LT5h YnNvbHV0ZVBvc2l0aW9uKHgsIHkpOworICAgICAgICAgICAgSW50UmVjdCBuZXdSZWN0LCBuZXdG dWxsUmVjdDsKKyAgICAgICAgICAgIGJvb2wgZnVsbFJlcGFpbnQgPSBmYWxzZTsKKyAgICAgICAg ICAgIGlmICh4ID09IG1fcmVwYWludFggJiYgeSA9PSBtX3JlcGFpbnRZKSB7CisgICAgICAgICAg ICAgICAgaWYgKG1fZnVsbFJlcGFpbnRPbkdyb3cpCisgICAgICAgICAgICAgICAgICAgIGZ1bGxS ZXBhaW50ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAg IG1fb2JqZWN0LT5yZXBhaW50QWZ0ZXJMYXlvdXRJZk5lZWRlZChtX3JlcGFpbnRSZWN0LCBtX2Z1 bGxSZXBhaW50UmVjdCk7CisgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIGMt PnJlcGFpbnRWaWV3UmVjdGFuZ2xlKG1fZnVsbFJlcGFpbnRSZWN0KTsKLSAgICAgICAgICAgICAg ICBJbnRSZWN0IG5ld1JlY3QsIG5ld0Z1bGxSZWN0OworICAgICAgICAgICAgICAgIGZ1bGxSZXBh aW50ID0gdHJ1ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChmdWxsUmVwYWludCkg ewogICAgICAgICAgICAgICAgIG1fb2JqZWN0LT5nZXRBYnNvbHV0ZVJlcGFpbnRSZWN0SW5jbHVk aW5nRmxvYXRzKG5ld1JlY3QsIG5ld0Z1bGxSZWN0KTsKICAgICAgICAgICAgICAgICBpZiAobmV3 UmVjdCAhPSBtX3JlcGFpbnRSZWN0KQogICAgICAgICAgICAgICAgICAgICBjLT5yZXBhaW50Vmll d1JlY3RhbmdsZShuZXdGdWxsUmVjdCk7CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHJl dmlzaW9uIDEzODgwKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzk3LDYgKzM5Nyw3IEBAIHByb3RlY3RlZDogICAKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIC8vIHdlIGVuZGVkIHVwIHBhaW50aW5nIHRoaXMgbGF5ZXIgb3Ig YW55IGRlc2NlbmRhbnRzIChhbmQgdGhlcmVmb3JlIG5lZWQgdG8KICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIGJsZW5kKS4KICAgICBib29sIG1faW5PdmVyZmxvd1JlbGF5b3V0 IDogMTsKKyAgICBib29sIG1fZnVsbFJlcGFpbnRPbkdyb3cgOiAxOwogCiAgICAgTWFycXVlZSog bV9tYXJxdWVlOyAvLyBVc2VkIGJ5IGxheWVycyB3aXRoIG92ZXJmbG93Om1hcnF1ZWUKIH07Cg== 7751 2006-04-16 15:36:15 -0700 2006-04-16 15:37:54 -0700 Possible fix 6770_r1.patch text/plain 2798 mitz SW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDEzODgwKQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzgsNiAr MTM4LDcgQEAgbV9vdmVyZmxvd0xpc3REaXJ0eSh0cnVlKSwKIG1faXNPdmVyZmxvd09ubHkoc2hv dWxkQmVPdmVyZmxvd09ubHkoKSksCiBtX3VzZWRUcmFuc3BhcmVuY3koZmFsc2UpLAogbV9pbk92 ZXJmbG93UmVsYXlvdXQoZmFsc2UpLAorbV9mdWxsUmVwYWludE9uR3JvdyhmYWxzZSksCiBtX21h cnF1ZWUoMCkKIHsKIH0KQEAgLTE2MSw2ICsxNjIsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjb21w dXRlUmVwYWludFJlY3RzKCkKIHsKICAgICAvLyBGSVhNRTogQ2hpbGQgb2JqZWN0IGNvdWxkIG92 ZXJyaWRlIHZpc2liaWxpdHkuCiAgICAgaWYgKG1fb2JqZWN0LT5zdHlsZSgpLT52aXNpYmlsaXR5 KCkgPT0gVklTSUJMRSkgeworICAgICAgICBtX2Z1bGxSZXBhaW50T25Hcm93ID0gbV9vYmplY3Qt PnNlbGZOZWVkc0xheW91dCgpIHx8IG1fb2JqZWN0LT5ub3JtYWxDaGlsZE5lZWRzTGF5b3V0KCk7 CiAgICAgICAgIG1fb2JqZWN0LT5nZXRBYnNvbHV0ZVJlcGFpbnRSZWN0SW5jbHVkaW5nRmxvYXRz KG1fcmVwYWludFJlY3QsIG1fZnVsbFJlcGFpbnRSZWN0KTsKICAgICAgICAgbV9vYmplY3QtPmFi c29sdXRlUG9zaXRpb24obV9yZXBhaW50WCwgbV9yZXBhaW50WSk7CiAgICAgfQpAQCAtMTkwLDE4 ICsxOTIsMjAgQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlTGF5ZXJQb3NpdGlvbnMoYgogCiAg ICAgLy8gRklYTUU6IENoaWxkIG9iamVjdCBjb3VsZCBvdmVycmlkZSB2aXNpYmlsaXR5LgogICAg IGlmIChjaGVja0ZvclJlcGFpbnQgJiYgKG1fb2JqZWN0LT5zdHlsZSgpLT52aXNpYmlsaXR5KCkg PT0gVklTSUJMRSkpIHsKLSAgICAgICAgaW50IHgsIHk7Ci0gICAgICAgIG1fb2JqZWN0LT5hYnNv bHV0ZVBvc2l0aW9uKHgsIHkpOwotICAgICAgICBpZiAoeCA9PSBtX3JlcGFpbnRYICYmIHkgPT0g bV9yZXBhaW50WSkKLSAgICAgICAgICAgIG1fb2JqZWN0LT5yZXBhaW50QWZ0ZXJMYXlvdXRJZk5l ZWRlZChtX3JlcGFpbnRSZWN0LCBtX2Z1bGxSZXBhaW50UmVjdCk7Ci0gICAgICAgIGVsc2Ugewot ICAgICAgICAgICAgUmVuZGVyQ2FudmFzICpjID0gbV9vYmplY3QtPmNhbnZhcygpOwotICAgICAg ICAgICAgaWYgKGMgJiYgIWMtPnByaW50aW5nTW9kZSgpKSB7Ci0gICAgICAgICAgICAgICAgYy0+ cmVwYWludFZpZXdSZWN0YW5nbGUobV9mdWxsUmVwYWludFJlY3QpOwotICAgICAgICAgICAgICAg IEludFJlY3QgbmV3UmVjdCwgbmV3RnVsbFJlY3Q7CisgICAgICAgIFJlbmRlckNhbnZhcyAqYyA9 IG1fb2JqZWN0LT5jYW52YXMoKTsKKyAgICAgICAgaWYgKGMgJiYgIWMtPnByaW50aW5nTW9kZSgp KSB7CisgICAgICAgICAgICBpbnQgeCwgeTsKKyAgICAgICAgICAgIG1fb2JqZWN0LT5hYnNvbHV0 ZVBvc2l0aW9uKHgsIHkpOworICAgICAgICAgICAgSW50UmVjdCBuZXdSZWN0LCBuZXdGdWxsUmVj dDsKKyAgICAgICAgICAgIGJvb2wgZGlkTW92ZSA9IHggIT0gbV9yZXBhaW50WCB8fCB5ICE9IG1f cmVwYWludFk7CisgICAgICAgICAgICBpZiAoIWRpZE1vdmUgJiYgIW1fZnVsbFJlcGFpbnRPblJl c2l6ZSkKKyAgICAgICAgICAgICAgICBtX29iamVjdC0+cmVwYWludEFmdGVyTGF5b3V0SWZOZWVk ZWQobV9yZXBhaW50UmVjdCwgbV9mdWxsUmVwYWludFJlY3QpOworICAgICAgICAgICAgZWxzZSB7 CiAgICAgICAgICAgICAgICAgbV9vYmplY3QtPmdldEFic29sdXRlUmVwYWludFJlY3RJbmNsdWRp bmdGbG9hdHMobmV3UmVjdCwgbmV3RnVsbFJlY3QpOwotICAgICAgICAgICAgICAgIGlmIChuZXdS ZWN0ICE9IG1fcmVwYWludFJlY3QpCisgICAgICAgICAgICAgICAgaWYgKGRpZE1vdmUgfHwgbmV3 UmVjdCAhPSBtX3JlcGFpbnRSZWN0KSB7CisgICAgICAgICAgICAgICAgICAgIGMtPnJlcGFpbnRW aWV3UmVjdGFuZ2xlKG1fZnVsbFJlcGFpbnRSZWN0KTsKICAgICAgICAgICAgICAgICAgICAgYy0+ cmVwYWludFZpZXdSZWN0YW5nbGUobmV3RnVsbFJlY3QpOworICAgICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aAkocmV2aXNpb24gMTM4ODApCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zOTcsNiArMzk3LDcgQEAgcHJvdGVjdGVkOiAgIAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgLy8gd2UgZW5kZWQgdXAgcGFpbnRpbmcgdGhpcyBsYXll ciBvciBhbnkgZGVzY2VuZGFudHMgKGFuZCB0aGVyZWZvcmUgbmVlZCB0bwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgLy8gYmxlbmQpLgogICAgIGJvb2wgbV9pbk92ZXJmbG93UmVs YXlvdXQgOiAxOworICAgIGJvb2wgbV9mdWxsUmVwYWludE9uUmVzaXplIDogMTsKIAogICAgIE1h cnF1ZWUqIG1fbWFycXVlZTsgLy8gVXNlZCBieSBsYXllcnMgd2l0aCBvdmVyZmxvdzptYXJxdWVl CiB9Owo= 7752 2006-04-16 15:37:54 -0700 2006-04-18 14:15:56 -0700 Possible fix 6770_r1.patch text/plain 2802 mitz SW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDEzODgwKQorKysgV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzgsNiAr MTM4LDcgQEAgbV9vdmVyZmxvd0xpc3REaXJ0eSh0cnVlKSwKIG1faXNPdmVyZmxvd09ubHkoc2hv dWxkQmVPdmVyZmxvd09ubHkoKSksCiBtX3VzZWRUcmFuc3BhcmVuY3koZmFsc2UpLAogbV9pbk92 ZXJmbG93UmVsYXlvdXQoZmFsc2UpLAorbV9mdWxsUmVwYWludE9uUmVzaXplKGZhbHNlKSwKIG1f bWFycXVlZSgwKQogewogfQpAQCAtMTYxLDYgKzE2Miw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNv bXB1dGVSZXBhaW50UmVjdHMoKQogewogICAgIC8vIEZJWE1FOiBDaGlsZCBvYmplY3QgY291bGQg b3ZlcnJpZGUgdmlzaWJpbGl0eS4KICAgICBpZiAobV9vYmplY3QtPnN0eWxlKCktPnZpc2liaWxp dHkoKSA9PSBWSVNJQkxFKSB7CisgICAgICAgIG1fZnVsbFJlcGFpbnRPblJlc2l6ZSA9IG1fb2Jq ZWN0LT5zZWxmTmVlZHNMYXlvdXQoKSB8fCBtX29iamVjdC0+bm9ybWFsQ2hpbGROZWVkc0xheW91 dCgpOwogICAgICAgICBtX29iamVjdC0+Z2V0QWJzb2x1dGVSZXBhaW50UmVjdEluY2x1ZGluZ0Zs b2F0cyhtX3JlcGFpbnRSZWN0LCBtX2Z1bGxSZXBhaW50UmVjdCk7CiAgICAgICAgIG1fb2JqZWN0 LT5hYnNvbHV0ZVBvc2l0aW9uKG1fcmVwYWludFgsIG1fcmVwYWludFkpOwogICAgIH0KQEAgLTE5 MCwxOCArMTkyLDIwIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zKGIK IAogICAgIC8vIEZJWE1FOiBDaGlsZCBvYmplY3QgY291bGQgb3ZlcnJpZGUgdmlzaWJpbGl0eS4K ICAgICBpZiAoY2hlY2tGb3JSZXBhaW50ICYmIChtX29iamVjdC0+c3R5bGUoKS0+dmlzaWJpbGl0 eSgpID09IFZJU0lCTEUpKSB7Ci0gICAgICAgIGludCB4LCB5OwotICAgICAgICBtX29iamVjdC0+ YWJzb2x1dGVQb3NpdGlvbih4LCB5KTsKLSAgICAgICAgaWYgKHggPT0gbV9yZXBhaW50WCAmJiB5 ID09IG1fcmVwYWludFkpCi0gICAgICAgICAgICBtX29iamVjdC0+cmVwYWludEFmdGVyTGF5b3V0 SWZOZWVkZWQobV9yZXBhaW50UmVjdCwgbV9mdWxsUmVwYWludFJlY3QpOwotICAgICAgICBlbHNl IHsKLSAgICAgICAgICAgIFJlbmRlckNhbnZhcyAqYyA9IG1fb2JqZWN0LT5jYW52YXMoKTsKLSAg ICAgICAgICAgIGlmIChjICYmICFjLT5wcmludGluZ01vZGUoKSkgewotICAgICAgICAgICAgICAg IGMtPnJlcGFpbnRWaWV3UmVjdGFuZ2xlKG1fZnVsbFJlcGFpbnRSZWN0KTsKLSAgICAgICAgICAg ICAgICBJbnRSZWN0IG5ld1JlY3QsIG5ld0Z1bGxSZWN0OworICAgICAgICBSZW5kZXJDYW52YXMg KmMgPSBtX29iamVjdC0+Y2FudmFzKCk7CisgICAgICAgIGlmIChjICYmICFjLT5wcmludGluZ01v ZGUoKSkgeworICAgICAgICAgICAgaW50IHgsIHk7CisgICAgICAgICAgICBtX29iamVjdC0+YWJz b2x1dGVQb3NpdGlvbih4LCB5KTsKKyAgICAgICAgICAgIEludFJlY3QgbmV3UmVjdCwgbmV3RnVs bFJlY3Q7CisgICAgICAgICAgICBib29sIGRpZE1vdmUgPSB4ICE9IG1fcmVwYWludFggfHwgeSAh PSBtX3JlcGFpbnRZOworICAgICAgICAgICAgaWYgKCFkaWRNb3ZlICYmICFtX2Z1bGxSZXBhaW50 T25SZXNpemUpCisgICAgICAgICAgICAgICAgbV9vYmplY3QtPnJlcGFpbnRBZnRlckxheW91dElm TmVlZGVkKG1fcmVwYWludFJlY3QsIG1fZnVsbFJlcGFpbnRSZWN0KTsKKyAgICAgICAgICAgIGVs c2UgewogICAgICAgICAgICAgICAgIG1fb2JqZWN0LT5nZXRBYnNvbHV0ZVJlcGFpbnRSZWN0SW5j bHVkaW5nRmxvYXRzKG5ld1JlY3QsIG5ld0Z1bGxSZWN0KTsKLSAgICAgICAgICAgICAgICBpZiAo bmV3UmVjdCAhPSBtX3JlcGFpbnRSZWN0KQorICAgICAgICAgICAgICAgIGlmIChkaWRNb3ZlIHx8 IG5ld1JlY3QgIT0gbV9yZXBhaW50UmVjdCkgeworICAgICAgICAgICAgICAgICAgICBjLT5yZXBh aW50Vmlld1JlY3RhbmdsZShtX2Z1bGxSZXBhaW50UmVjdCk7CiAgICAgICAgICAgICAgICAgICAg IGMtPnJlcGFpbnRWaWV3UmVjdGFuZ2xlKG5ld0Z1bGxSZWN0KTsKKyAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBXZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmgJKHJldmlzaW9uIDEzODgwKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aAkod29ya2luZyBjb3B5KQpAQCAtMzk3LDYgKzM5Nyw3IEBAIHByb3RlY3RlZDogICAKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHdlIGVuZGVkIHVwIHBhaW50aW5nIHRoaXMg bGF5ZXIgb3IgYW55IGRlc2NlbmRhbnRzIChhbmQgdGhlcmVmb3JlIG5lZWQgdG8KICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGJsZW5kKS4KICAgICBib29sIG1faW5PdmVyZmxv d1JlbGF5b3V0IDogMTsKKyAgICBib29sIG1fZnVsbFJlcGFpbnRPblJlc2l6ZSA6IDE7CiAKICAg ICBNYXJxdWVlKiBtX21hcnF1ZWU7IC8vIFVzZWQgYnkgbGF5ZXJzIHdpdGggb3ZlcmZsb3c6bWFy cXVlZQogfTsK 7810 2006-04-18 14:15:56 -0700 2006-04-18 14:17:30 -0700 Patch, including change log and manual test 6770_r3.patch text/plain 5651 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxMzk1NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDYtIyMtIyMgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdA bWl0enBldHRlbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgLSBmaXggaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNn aT9pZD02NzcwCisgICAgICAgICAgUkVHUkVTU0lPTjogSW5jb21wbGV0ZSByZXBhaW50IHdoZW4g YmxvY2sgd2l0aCBjbGlwcGluZyBncm93cworCisgICAgICAgICogbWFudWFsLXRlc3RzL3JlcGFp bnQtcmVzaXplZC1vdmVyZmxvdy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OlJlbmRlckxheWVy KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjb21wdXRlUmVwYWludFJlY3RzKTog U2V0IHRoZSBtX3JlcGFpbnRPdmVyZmxvd09uUmVzaXplCisgICAgICAgIGZsYWcgdG8gdHJ1ZSBp ZiBvdXIgb2JqZWN0IGl0c2VsZiBuZWVkcyBsYXlvdXQgb3IgaWYgd2UncmUgYW4gb3ZlcmZsb3cK KyAgICAgICAgYW5kIGhhdmUgYSBub3JtYWwgY2hpbGQgdGhhdCBuZWVkcyBsYXlvdXQsIGluIHdo aWNoIGNhc2UgaWYgd2UgZW5kIHVwCisgICAgICAgIHJlc2l6aW5nIGl0IHdpbGwgYmUgYmVjYXVz ZSBvZiB0aGUgY2hpbGQsIGFuZCB0aGF0IGNoaWxkIG1pZ2h0IGhhdmUgbm90IHJlcGFpbnRlZAor ICAgICAgICBpdHNlbGYgY29ycmVjdGx5IGR1cmluZyBpdHMgb3duIGxheW91dC4KKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVMYXllclBvc2l0aW9ucyk6IERvIGEgZnVsbCBy ZXBhaW50IGlmCisgICAgICAgIG1fcmVwYWludE92ZXJmbG93T25SZXNpemUgaXMgc2V0IGFuZCB3 ZSByZXNpemVkIGJ1dCBkaWRuJ3QgbW92ZS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuaDoKKwogMjAwNi0wNC0xNyAgSnVzdGluIEdhcmNpYSAgPGp1c3Rpbi5nYXJjaWFAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IGhhcnJpc29uCkluZGV4OiBXZWJDb3JlL21hbnVh bC10ZXN0cy9yZXBhaW50LXJlc2l6ZWQtb3ZlcmZsb3cuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL21hbnVhbC10ZXN0cy9yZXBhaW50LXJlc2l6ZWQtb3ZlcmZsb3cuaHRtbAkocmV2aXNpb24g MCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3RzL3JlcGFpbnQtcmVzaXplZC1vdmVyZmxvdy5odG1s CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDM2IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0v L1czQy8vRFREIEhUTUwgNC4wMS8vRU4iCisgICAgICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi9o dG1sNC9zdHJpY3QuZHRkIj4KKzxodG1sIGxhbmc9ImVuIj4KKzxoZWFkPgorPHNjcmlwdD4KKyAg ICBmdW5jdGlvbiB0ZXN0KCkKKyAgICB7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJ0Iikuc3R5bGUuaGVpZ2h0PScxMDBweCc7CisgICAgfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keSBvbmxvYWQ9InNldFRpbWVvdXQodGVzdCwgMCk7Ij4KKzxwPjxiPkJVRyBJRDo8L2I+IDxh IGhyZWY9Imh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njc3 MCI+QnVnemlsbGEgYnVnIDY3NzA8L2E+IFJFR1JFU1NJT046IEluY29tcGxldGUgcmVwYWludCB3 aGVuIGJsb2NrIHdpdGggY2xpcHBpbmcgZ3Jvd3M8L3A+CisKKzxwIGlkPSJ0ZXN0IiBzdHlsZT0i YmFja2dyb3VuZC1jb2xvcjpza3libHVlOyBwYWRkaW5nOjNweDsiPjxiPlNURVBTIFRPIFRFU1Q6 PC9iPiAKK0RvIG5vdCByZXNpemUgdGhlIHdpbmRvdywgaGlkZSBpdCwgc2Nyb2xsLCBvciBzd2l0 Y2ggdG8gYSBkaWZmZXJlbnQgdGFiLiBJZiB5b3UgZG8sIHJlbG9hZAordGhlIHRlc3QgYmVmb3Jl IHByb2NlZWRpbmcuCis8L3A+CisKKzxwIGlkPSJzdWNjZXNzIiBzdHlsZT0iYmFja2dyb3VuZC1j b2xvcjpwYWxlZ3JlZW47IHBhZGRpbmc6M3B4OyI+PGI+VEVTVCBQQVNTOjwvYj4gCitUaGVyZSBz aG91bGQgYmUgYSB3aGl0ZSBzcXVhcmUgd2l0aCBhIGJsdWUgYm9yZGVyIGJlbG93LCBhbmQgbm8g bGluZSBydW5uaW5nIHRocm91Z2gKK3RoZSBtaWRkbGUgb2YgdGhlIHNxdWFyZS4KKzwvcD4KKwor PHAgaWQ9ImZhaWx1cmUiIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiNGRjMzMDA7IHBhZGRpbmc6 M3B4OyI+PGI+VEVTVCBGQUlMOjwvYj4gIAorVGhlIHdoaXRlIHNxdWFyZSB3aWxsIGhhdmUgYSBi bHVlIGJvcmRlciBhbmQgYSBibHVlIGhvcml6b250YWwgbGluZSBydW5uaW5nIHRocm91Z2ggaXRz IG1pZGRsZS4KKzwvcD4KKworPGRpdiBzdHlsZT0ib3ZlcmZsb3c6IGhpZGRlbjsiPgorICAgIDxk aXYgaWQ9InMiIHN0eWxlPSJib3JkZXI6IDRweCBzb2xpZCBibHVlOyB3aWR0aDogMTAwcHg7Ij4K KyAgICAgICAgPGRpdiBpZD0idCIgc3R5bGU9IndpZHRoOiAxMHB4OyBoZWlnaHQ6IDQ4cHg7IG1h cmdpbi1sZWZ0OiAxMjBweDsiPjwvZGl2PgorICAgIDwvZGl2PgorPC9kaXY+CisKKzwvYm9keT4K KzwvaHRtbD4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAJKHJldmlzaW9uIDEzOTU2 KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMzgsNiArMTM4LDcgQEAgbV9vdmVyZmxvd0xpc3REaXJ0eSh0cnVlKSwKIG1faXNPdmVyZmxv d09ubHkoc2hvdWxkQmVPdmVyZmxvd09ubHkoKSksCiBtX3VzZWRUcmFuc3BhcmVuY3koZmFsc2Up LAogbV9pbk92ZXJmbG93UmVsYXlvdXQoZmFsc2UpLAorbV9yZXBhaW50T3ZlcmZsb3dPblJlc2l6 ZShmYWxzZSksCiBtX21hcnF1ZWUoMCkKIHsKIH0KQEAgLTE2MSw2ICsxNjIsNyBAQCB2b2lkIFJl bmRlckxheWVyOjpjb21wdXRlUmVwYWludFJlY3RzKCkKIHsKICAgICAvLyBGSVhNRTogQ2hpbGQg b2JqZWN0IGNvdWxkIG92ZXJyaWRlIHZpc2liaWxpdHkuCiAgICAgaWYgKG1fb2JqZWN0LT5zdHls ZSgpLT52aXNpYmlsaXR5KCkgPT0gVklTSUJMRSkgeworICAgICAgICBtX3JlcGFpbnRPdmVyZmxv d09uUmVzaXplID0gbV9vYmplY3QtPnNlbGZOZWVkc0xheW91dCgpIHx8IG1fb2JqZWN0LT5oYXNP dmVyZmxvd0NsaXAoKSAmJiBtX29iamVjdC0+bm9ybWFsQ2hpbGROZWVkc0xheW91dCgpOwogICAg ICAgICBtX29iamVjdC0+Z2V0QWJzb2x1dGVSZXBhaW50UmVjdEluY2x1ZGluZ0Zsb2F0cyhtX3Jl cGFpbnRSZWN0LCBtX2Z1bGxSZXBhaW50UmVjdCk7CiAgICAgICAgIG1fb2JqZWN0LT5hYnNvbHV0 ZVBvc2l0aW9uKG1fcmVwYWludFgsIG1fcmVwYWludFkpOwogICAgIH0KQEAgLTE5MCwxOCArMTky LDIwIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUxheWVyUG9zaXRpb25zKGIKIAogICAgIC8v IEZJWE1FOiBDaGlsZCBvYmplY3QgY291bGQgb3ZlcnJpZGUgdmlzaWJpbGl0eS4KICAgICBpZiAo Y2hlY2tGb3JSZXBhaW50ICYmIChtX29iamVjdC0+c3R5bGUoKS0+dmlzaWJpbGl0eSgpID09IFZJ U0lCTEUpKSB7Ci0gICAgICAgIGludCB4LCB5OwotICAgICAgICBtX29iamVjdC0+YWJzb2x1dGVQ b3NpdGlvbih4LCB5KTsKLSAgICAgICAgaWYgKHggPT0gbV9yZXBhaW50WCAmJiB5ID09IG1fcmVw YWludFkpCi0gICAgICAgICAgICBtX29iamVjdC0+cmVwYWludEFmdGVyTGF5b3V0SWZOZWVkZWQo bV9yZXBhaW50UmVjdCwgbV9mdWxsUmVwYWludFJlY3QpOwotICAgICAgICBlbHNlIHsKLSAgICAg ICAgICAgIFJlbmRlckNhbnZhcyAqYyA9IG1fb2JqZWN0LT5jYW52YXMoKTsKLSAgICAgICAgICAg IGlmIChjICYmICFjLT5wcmludGluZ01vZGUoKSkgewotICAgICAgICAgICAgICAgIGMtPnJlcGFp bnRWaWV3UmVjdGFuZ2xlKG1fZnVsbFJlcGFpbnRSZWN0KTsKLSAgICAgICAgICAgICAgICBJbnRS ZWN0IG5ld1JlY3QsIG5ld0Z1bGxSZWN0OworICAgICAgICBSZW5kZXJDYW52YXMgKmMgPSBtX29i amVjdC0+Y2FudmFzKCk7CisgICAgICAgIGlmIChjICYmICFjLT5wcmludGluZ01vZGUoKSkgewor ICAgICAgICAgICAgaW50IHgsIHk7CisgICAgICAgICAgICBtX29iamVjdC0+YWJzb2x1dGVQb3Np dGlvbih4LCB5KTsKKyAgICAgICAgICAgIEludFJlY3QgbmV3UmVjdCwgbmV3RnVsbFJlY3Q7Cisg ICAgICAgICAgICBib29sIGRpZE1vdmUgPSB4ICE9IG1fcmVwYWludFggfHwgeSAhPSBtX3JlcGFp bnRZOworICAgICAgICAgICAgaWYgKCFkaWRNb3ZlICYmICFtX3JlcGFpbnRPdmVyZmxvd09uUmVz aXplKQorICAgICAgICAgICAgICAgIG1fb2JqZWN0LT5yZXBhaW50QWZ0ZXJMYXlvdXRJZk5lZWRl ZChtX3JlcGFpbnRSZWN0LCBtX2Z1bGxSZXBhaW50UmVjdCk7CisgICAgICAgICAgICBlbHNlIHsK ICAgICAgICAgICAgICAgICBtX29iamVjdC0+Z2V0QWJzb2x1dGVSZXBhaW50UmVjdEluY2x1ZGlu Z0Zsb2F0cyhuZXdSZWN0LCBuZXdGdWxsUmVjdCk7Ci0gICAgICAgICAgICAgICAgaWYgKG5ld1Jl Y3QgIT0gbV9yZXBhaW50UmVjdCkKKyAgICAgICAgICAgICAgICBpZiAoZGlkTW92ZSB8fCBuZXdS ZWN0ICE9IG1fcmVwYWludFJlY3QpIHsKKyAgICAgICAgICAgICAgICAgICAgYy0+cmVwYWludFZp ZXdSZWN0YW5nbGUobV9mdWxsUmVwYWludFJlY3QpOwogICAgICAgICAgICAgICAgICAgICBjLT5y ZXBhaW50Vmlld1JlY3RhbmdsZShuZXdGdWxsUmVjdCk7CisgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o CShyZXZpc2lvbiAxMzk1NikKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHdv cmtpbmcgY29weSkKQEAgLTM5Nyw2ICszOTcsNyBAQCBwcm90ZWN0ZWQ6ICAgCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAvLyB3ZSBlbmRlZCB1cCBwYWludGluZyB0aGlzIGxheWVy IG9yIGFueSBkZXNjZW5kYW50cyAoYW5kIHRoZXJlZm9yZSBuZWVkIHRvCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAvLyBibGVuZCkuCiAgICAgYm9vbCBtX2luT3ZlcmZsb3dSZWxh eW91dCA6IDE7CisgICAgYm9vbCBtX3JlcGFpbnRPdmVyZmxvd09uUmVzaXplIDogMTsKIAogICAg IE1hcnF1ZWUqIG1fbWFycXVlZTsgLy8gVXNlZCBieSBsYXllcnMgd2l0aCBvdmVyZmxvdzptYXJx dWVlCiB9Owo=