31289 2009-11-10 04:06:31 -0800 rename counter to makeCounterNode in RenderCounter.cpp 2009-11-17 09:43:18 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 hamaji webkit-unassigned darin dglazkov oldest_to_newest 162011 0 hamaji 2009-11-10 04:06:31 -0800 As suggested in Bug 30505, the function name "counter" isn't good as this creates a counter as a side-effect. 162012 1 42857 hamaji 2009-11-10 04:07:30 -0800 Created attachment 42857 Patch v1 162320 2 42857 hamaji 2009-11-10 19:16:38 -0800 Comment on attachment 42857 Patch v1 Clearing flags on attachment: 42857 Committed r50787: <http://trac.webkit.org/changeset/50787> 162321 3 hamaji 2009-11-10 19:16:44 -0800 All reviewed patches have been landed. Closing bug. 164180 4 43349 hamaji 2009-11-17 01:41:45 -0800 Created attachment 43349 Patch v2 164241 5 dglazkov 2009-11-17 08:27:23 -0800 Whoops, wrong bug? :) You should probably repost the patch you have here as a new issue. 164255 6 43349 darin 2009-11-17 09:43:18 -0800 Comment on attachment 43349 Patch v2 Clearing review flag since this was attached to the wrong bug. 42857 2009-11-10 04:07:30 -0800 2009-11-17 01:41:40 -0800 Patch v1 bug-31289-20091110210728.patch text/plain 2675 hamaji ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yzc2ZDRhZC4uZmIzOWRlZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMS0xMCAgU2hpbmljaGlybyBI YW1hamkgIDxoYW1hamlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIHJlbmFtZSBjb3VudGVyIHRvIG1ha2VDb3VudGVyTm9kZSBp biBSZW5kZXJDb3VudGVyLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzEyODkKKworICAgICAgICBObyBuZXcgdGVzdCBiZWNhdXNlIHRoaXMgaXMg anVzdCBhIHNtYWxsIHJlZmFjdG9yaW5nLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckNv dW50ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmluZFBsYWNlRm9yQ291bnRlcik6CisgICAg ICAgIChXZWJDb3JlOjptYWtlQ291bnRlck5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Q291bnRlcjo6b3JpZ2luYWxUZXh0KToKKwogMjAwOS0xMS0xMCAgUGhpbGlwcGUgTm9ybWFuZCAg PHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwu CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJDb3VudGVyLmNwcCBiL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCmluZGV4IDE3YzZkYWQuLjU5MTIzYWYgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCisrKyBiL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCkBAIC0zOCw3ICszOCw3IEBAIHVzaW5nIG5h bWVzcGFjZSBIVE1MTmFtZXM7CiB0eXBlZGVmIEhhc2hNYXA8UmVmUHRyPEF0b21pY1N0cmluZ0lt cGw+LCBDb3VudGVyTm9kZSo+IENvdW50ZXJNYXA7CiB0eXBlZGVmIEhhc2hNYXA8Y29uc3QgUmVu ZGVyT2JqZWN0KiwgQ291bnRlck1hcCo+IENvdW50ZXJNYXBzOwogCi1zdGF0aWMgQ291bnRlck5v ZGUqIGNvdW50ZXIoUmVuZGVyT2JqZWN0KiwgY29uc3QgQXRvbWljU3RyaW5nJiBjb3VudGVyTmFt ZSwgYm9vbCBhbHdheXNDcmVhdGVDb3VudGVyKTsKK3N0YXRpYyBDb3VudGVyTm9kZSogbWFrZUNv dW50ZXJOb2RlKFJlbmRlck9iamVjdCosIGNvbnN0IEF0b21pY1N0cmluZyYgY291bnRlck5hbWUs IGJvb2wgYWx3YXlzQ3JlYXRlQ291bnRlcik7CiAKIHN0YXRpYyBDb3VudGVyTWFwcyYgY291bnRl ck1hcHMoKQogewpAQCAtMTQ4LDcgKzE0OCw3IEBAIHN0YXRpYyBib29sIGZpbmRQbGFjZUZvckNv dW50ZXIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IEF0b21pY1N0cmluZyYgY291bnRlCiAg ICAgLy8gc2libGluZyBvciB0aGUgcmVzZXQgbm9kZS4gVGhpcyBmbGFnIGNvbnRyb2xzIGl0Lgog ICAgIGJvb2wgY3JlYXRlQ2hpbGRGb3JSZXNldCA9IHRydWU7CiAgICAgd2hpbGUgKChwcmV2Q291 bnRlckNhbmRpZGF0ZSA9IHByZXZDb3VudGVyQ2FuZGlkYXRlLT5wcmV2aW91c0luUHJlT3JkZXIo KSkpIHsKLSAgICAgICAgQ291bnRlck5vZGUqIGMgPSBjb3VudGVyKHByZXZDb3VudGVyQ2FuZGlk YXRlLCBjb3VudGVyTmFtZSwgZmFsc2UpOworICAgICAgICBDb3VudGVyTm9kZSogYyA9IG1ha2VD b3VudGVyTm9kZShwcmV2Q291bnRlckNhbmRpZGF0ZSwgY291bnRlck5hbWUsIGZhbHNlKTsKICAg ICAgICAgaWYgKHByZXZDb3VudGVyQ2FuZGlkYXRlID09IHJlc2V0Q2FuZGlkYXRlKSB7CiAgICAg ICAgICAgICBpZiAoIWNhbmRpZGF0ZUNvdW50ZXIpIHsKICAgICAgICAgICAgICAgICBjYW5kaWRh dGVDb3VudGVyID0gYzsKQEAgLTE4NSw3ICsxODUsNyBAQCBzdGF0aWMgYm9vbCBmaW5kUGxhY2VG b3JDb3VudGVyKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBBdG9taWNTdHJpbmcmIGNvdW50 ZQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIENvdW50ZXJOb2RlKiBjb3VudGVyKFJl bmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBBdG9taWNTdHJpbmcmIGNvdW50ZXJOYW1lLCBib29s IGFsd2F5c0NyZWF0ZUNvdW50ZXIpCitzdGF0aWMgQ291bnRlck5vZGUqIG1ha2VDb3VudGVyTm9k ZShSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgQXRvbWljU3RyaW5nJiBjb3VudGVyTmFtZSwg Ym9vbCBhbHdheXNDcmVhdGVDb3VudGVyKQogewogICAgIEFTU0VSVChvYmplY3QpOwogCkBAIC0y NDYsNyArMjQ2LDcgQEAgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBSZW5kZXJDb3VudGVyOjpvcmln aW5hbFRleHQoKSBjb25zdAogICAgICAgICByZXR1cm4gMDsKIAogICAgIGlmICghbV9jb3VudGVy Tm9kZSkKLSAgICAgICAgbV9jb3VudGVyTm9kZSA9IGNvdW50ZXIocGFyZW50KCksIG1fY291bnRl ci5pZGVudGlmaWVyKCksIHRydWUpOworICAgICAgICBtX2NvdW50ZXJOb2RlID0gbWFrZUNvdW50 ZXJOb2RlKHBhcmVudCgpLCBtX2NvdW50ZXIuaWRlbnRpZmllcigpLCB0cnVlKTsKIAogICAgIENv dW50ZXJOb2RlKiBjaGlsZCA9IG1fY291bnRlck5vZGU7CiAgICAgaW50IHZhbHVlID0gY2hpbGQt PmlzUmVzZXQoKSA/IGNoaWxkLT52YWx1ZSgpIDogY2hpbGQtPmNvdW50SW5QYXJlbnQoKTs= 43349 2009-11-17 01:41:45 -0800 2009-11-17 09:43:17 -0800 Patch v2 bug-31289-20091117184143.patch text/plain 4795 hamaji ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NGQ4YzgwYi4uNWNlMjIzNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMS0xNyAgU2hpbmljaGlybyBI YW1hamkgIDxoYW1hamlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdpbiBjaHJvbWl1bSBpcyBzbG93IHRvIGRyYXcgdHJhbnNw YXJlbnQgdGV4dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTMxMjU4CisKKyAgICAgICAgQ3JlYXRlIGJvdW5kZWQgdHJhbnNwYXJlbmN5IGxheWVycyBp bnN0ZWFkIG9mIGp1c3QgY2xpcHBpbmcuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2Ug dGhpcyBpcyBqdXN0IGEgcGVyZm9ybWFuY2UgaW1wcm92ZW1lbnQuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VHJhbnNwYXJlbmN5QXdhcmVGb250UGFpbnRlcjo6VHJhbnNwYXJlbmN5QXdhcmVGb250 UGFpbnRlcjo6aW5pdGlhbGl6ZUZvckdESSk6CisgICAgICAgIChXZWJDb3JlOjpUcmFuc3BhcmVu Y3lBd2FyZUZvbnRQYWludGVyOjpUcmFuc3BhcmVuY3lBd2FyZUZvbnRQYWludGVyOjp+VHJhbnNw YXJlbmN5QXdhcmVGb250UGFpbnRlcik6CisKIDIwMDktMTEtMTYgIEtlbnQgVGFtdXJhICA8dGtl bnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZCBidWlsZCBmaXguCmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDaHJvbWl1bVdpbi5j cHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDaHJvbWl1bVdpbi5j cHAKaW5kZXggZGFlYTc2ZC4uYjUzMzE3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9Gb250Q2hyb21pdW1XaW4uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENocm9taXVtV2luLmNwcApAQCAtMTEyLDE5ICsxMTIs MjIgQEAgdm9pZCBUcmFuc3BhcmVuY3lBd2FyZUZvbnRQYWludGVyOjppbml0KCkKIAogdm9pZCBU cmFuc3BhcmVuY3lBd2FyZUZvbnRQYWludGVyOjppbml0aWFsaXplRm9yR0RJKCkKIHsKLSAgICBt X2dyYXBoaWNzQ29udGV4dC0+c2F2ZSgpOwogICAgIFNrQ29sb3IgY29sb3IgPSBtX3BsYXRmb3Jt Q29udGV4dC0+ZWZmZWN0aXZlRmlsbENvbG9yKCk7CisgICAgLy8gVXNlZCBvbmx5IHdoZW4gbV9j cmVhdGVkVHJhbnNwYXJlbmN5TGF5ZXIgaXMgdHJ1ZS4KKyAgICBmbG9hdCBsYXllckFscGhhID0g MC4wZjsKICAgICBpZiAoU2tDb2xvckdldEEoY29sb3IpICE9IDB4RkYpIHsKICAgICAgICAgLy8g V2hlbiB0aGUgZm9udCBoYXMgc29tZSB0cmFuc3BhcmVuY3ksIGFwcGx5IGl0IGJ5IGNyZWF0aW5n IGEgbmV3Ci0gICAgICAgIC8vIHRyYW5zcGFyZW5jeSBsYXllciB3aXRoIHRoYXQgb3BhY2l0eSBh cHBsaWVkLgorICAgICAgICAvLyB0cmFuc3BhcmVuY3kgbGF5ZXIgd2l0aCB0aGF0IG9wYWNpdHkg YXBwbGllZC4gV2UnbGwgYWN0dWFsbHkKKyAgICAgICAgLy8gY3JlYXRlIGEgbmV3IGxheWVyIGFm dGVyIHdlIGNhbGN1bGF0ZSB0aGUgYm91bmQgYm94LgogICAgICAgICBtX2NyZWF0ZWRUcmFuc3Bh cmVuY3lMYXllciA9IHRydWU7Ci0gICAgICAgIG1fZ3JhcGhpY3NDb250ZXh0LT5iZWdpblRyYW5z cGFyZW5jeUxheWVyKFNrQ29sb3JHZXRBKGNvbG9yKSAvIDI1NS4wZik7CisgICAgICAgIGxheWVy QWxwaGEgPSBTa0NvbG9yR2V0QShjb2xvcikgLyAyNTUuMGY7CiAgICAgICAgIC8vIFRoZSBjb2xv ciBzaG91bGQgYmUgb3BhcXVlIG5vdy4KICAgICAgICAgY29sb3IgPSBTa0NvbG9yU2V0UkdCKFNr Q29sb3JHZXRSKGNvbG9yKSwgU2tDb2xvckdldEcoY29sb3IpLCBTa0NvbG9yR2V0Qihjb2xvcikp OwogICAgIH0KIAogICAgIFRyYW5zcGFyZW5jeVdpbjo6TGF5ZXJNb2RlIGxheWVyTW9kZTsKICAg ICBJbnRSZWN0IGxheWVyUmVjdDsKKyAgICBTa1JlY3QqIGxheWVyUmVjdFNraWEgPSAwOwogICAg IGlmIChtX3BsYXRmb3JtQ29udGV4dC0+aXNEcmF3aW5nVG9JbWFnZUJ1ZmZlcigpKSB7CiAgICAg ICAgIC8vIEFzc3VtZSBpZiB3ZSdyZSBkcmF3aW5nIHRvIGFuIGltYWdlIGJ1ZmZlciB0aGF0IHRo ZSBiYWNrZ3JvdW5kCiAgICAgICAgIC8vIGlzIG5vdCBvcGFxdWUgYW5kIHdlIGhhdmUgdG8gdW5k byBDbGVhclR5cGUuIFdlIG1heSB3YW50IHRvCkBAIC0xMzIsMjQgKzEzNSwzNyBAQCB2b2lkIFRy YW5zcGFyZW5jeUF3YXJlRm9udFBhaW50ZXI6OmluaXRpYWxpemVGb3JHREkoKQogICAgICAgICAv LyBhbmQgd2UgY291bGQgZG8gQ2xlYXJUeXBlIGluIHRoYXQgY2FzZS4KICAgICAgICAgbGF5ZXJN b2RlID0gVHJhbnNwYXJlbmN5V2luOjpUZXh0Q29tcG9zaXRlOwogICAgICAgICBsYXllclJlY3Qg PSBlc3RpbWF0ZVRleHRCb3VuZHMoKTsKLSAgICAgICAgbV9ncmFwaGljc0NvbnRleHQtPmNsaXAo bGF5ZXJSZWN0KTsKKyAgICAgICAgbGF5ZXJSZWN0U2tpYSA9IG5ldyBTa1JlY3QobGF5ZXJSZWN0 KTsKIAogICAgICAgICAvLyBUaGUgdHJhbnNwYXJlbmN5IGhlbHBlciByZXF1aXJlcyB0aGF0IHdl IGRyYXcgdGV4dCBpbiBibGFjayBpbgogICAgICAgICAvLyB0aGlzIG1vZGUgYW5kIGl0IHdpbGwg YXBwbHkgdGhlIGNvbG9yLgogICAgICAgICBtX3RyYW5zcGFyZW5jeS5zZXRUZXh0Q29tcG9zaXRl Q29sb3IoY29sb3IpOwogICAgICAgICBjb2xvciA9IFNrQ29sb3JTZXRSR0IoMCwgMCwgMCk7Ci0g ICAgfSBlbHNlIGlmIChjYW52YXNIYXNNdWx0aXBsZUxheWVycyhtX3BsYXRmb3JtQ29udGV4dC0+ Y2FudmFzKCkpKSB7CisgICAgfSBlbHNlIGlmIChtX2NyZWF0ZWRUcmFuc3BhcmVuY3lMYXllciB8 fCBjYW52YXNIYXNNdWx0aXBsZUxheWVycyhtX3BsYXRmb3JtQ29udGV4dC0+Y2FudmFzKCkpKSB7 CiAgICAgICAgIC8vIFdoZW4gd2UncmUgZHJhd2luZyBhIHdlYiBwYWdlLCB3ZSBrbm93IHRoZSBi YWNrZ3JvdW5kIGlzIG9wYXF1ZSwKICAgICAgICAgLy8gYnV0IGlmIHdlJ3JlIGRyYXdpbmcgdG8g YSBsYXllciwgd2Ugc3RpbGwgbmVlZCBleHRyYSB3b3JrLgogICAgICAgICBsYXllck1vZGUgPSBU cmFuc3BhcmVuY3lXaW46Ok9wYXF1ZUNvbXBvc2l0ZUxheWVyOwogICAgICAgICBsYXllclJlY3Qg PSBlc3RpbWF0ZVRleHRCb3VuZHMoKTsKLSAgICAgICAgbV9ncmFwaGljc0NvbnRleHQtPmNsaXAo bGF5ZXJSZWN0KTsKKyAgICAgICAgbGF5ZXJSZWN0U2tpYSA9IG5ldyBTa1JlY3QobGF5ZXJSZWN0 KTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBDb21tb24gY2FzZSBvZiBkcmF3aW5nIG9udG8g dGhlIGJvdHRvbSBsYXllciBvZiBhIHdlYiBwYWdlOiB3ZQogICAgICAgICAvLyBrbm93IGV2ZXJ5 dGhpbmcgaXMgb3BhcXVlIHNvIGRvbid0IG5lZWQgdG8gZG8gYW55dGhpbmcgc3BlY2lhbC4KICAg ICAgICAgbGF5ZXJNb2RlID0gVHJhbnNwYXJlbmN5V2luOjpOb0xheWVyOwogICAgIH0KIAorICAg IGlmIChtX2NyZWF0ZWRUcmFuc3BhcmVuY3lMYXllcikgeworICAgICAgLy8gQ3JlYXRlIGEgdHJh bnNwYXJlbmN5IGxheWVyLiBXZSBjYWxsIHRoaXMgZnVuY3Rpb24gZGlyZWN0bHkgaW5zdGVhZCBv ZgorICAgICAgLy8gYmVnaW5UcmFuc3BhcmVuY3lMYXllciBiZWNhdXNlIGJlZ2luVHJhbnNwYXJl bmN5TGF5ZXIgZG9lc24ndCB0YWtlCisgICAgICAvLyBhIGJvdW5kaW5nIGJveCBhcyBhbiBhcmd1 bWVudC4gVGhpcyBsYXllciB3aWxsIGJlIGZpbmFsaXplZCBieQorICAgICAgLy8gZW5kVHJhbnNw YXJlbmN5TGF5ZXIuCisgICAgICBtX3BsYXRmb3JtQ29udGV4dC0+Y2FudmFzKCktPnNhdmVMYXll ckFscGhhKAorICAgICAgICAgIGxheWVyUmVjdFNraWEsCisgICAgICAgICAgc3RhdGljX2Nhc3Q8 dW5zaWduZWQgY2hhcj4obGF5ZXJBbHBoYSAqIDI1NSksCisgICAgICAgICAgc3RhdGljX2Nhc3Q8 U2tDYW52YXM6OlNhdmVGbGFncz4oU2tDYW52YXM6OmtIYXNBbHBoYUxheWVyX1NhdmVGbGFnIHwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTa0NhbnZhczo6a0Z1 bGxDb2xvckxheWVyX1NhdmVGbGFnKSk7CisgICAgICAgZGVsZXRlIGxheWVyUmVjdFNraWE7Cisg ICAgfQorCiAgICAgLy8gQnVnIDI2MDg4IC0gaW5pdCgpIG1pZ2h0IGZhaWwgaWYgbGF5ZXJSZWN0 IGlzIGludmFsaWQuIEdpdmVuIHRoaXMsIHdlCiAgICAgLy8gbmVlZCB0byBiZSBjYXJlZnVsIHRv IGNoZWNrIGZvciBudWxsIHBvaW50ZXJzIGV2ZXJ5d2hlcmUgYWZ0ZXIgdGhpcyBjYWxsCiAgICAg bV90cmFuc3BhcmVuY3kuaW5pdChtX2dyYXBoaWNzQ29udGV4dCwgbGF5ZXJNb2RlLCAKQEAgLTE3 MCw3ICsxODYsNiBAQCBUcmFuc3BhcmVuY3lBd2FyZUZvbnRQYWludGVyOjp+VHJhbnNwYXJlbmN5 QXdhcmVGb250UGFpbnRlcigpCiAgICAgbV90cmFuc3BhcmVuY3kuY29tcG9zaXRlKCk7CiAgICAg aWYgKG1fY3JlYXRlZFRyYW5zcGFyZW5jeUxheWVyKQogICAgICAgICBtX2dyYXBoaWNzQ29udGV4 dC0+ZW5kVHJhbnNwYXJlbmN5TGF5ZXIoKTsKLSAgICBtX2dyYXBoaWNzQ29udGV4dC0+cmVzdG9y ZSgpOwogICAgIG1fcGxhdGZvcm1Db250ZXh0LT5jYW52YXMoKS0+ZW5kUGxhdGZvcm1QYWludCgp OwogfQogCg==