24926 2009-03-29 15:57:08 -0700 Upstream a fix for Chromium build. 2009-03-30 16:34:58 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dimich dimich dglazkov oldest_to_newest 115761 0 dimich 2009-03-29 15:57:08 -0700 Build break was caused by using the same name for 2 different variables in the same scope. 115762 1 29048 dimich 2009-03-29 15:59:24 -0700 Created attachment 29048 Proposed patch 115933 2 dimich 2009-03-30 16:34:58 -0700 Landed: http://trac.webkit.org/changeset/42088 29048 2009-03-29 15:59:24 -0700 2009-03-29 16:07:13 -0700 Proposed patch patch.txt text/plain 4372 dimich ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODUzZWYxOC4uMTcxMzUzYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0wMy0yOSAgRG1pdHJ5IFRpdG92 ICA8ZGltaWNoQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjQ5MjYKKyAgICAgICAgRml4IENocm9taXVtIGJ1aWxkIGJyZWFrLgorCisgICAgICAgICogYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNBTExCQUNLX0ZVTkNfREVDTChET01XaW5kb3dTaG93TW9kYWxEaWFsb2cpKTogcmVuYW1lZCAn ZmVhdHVyZXMnIGludG8gJ3dpbmRvd0ZlYXR1cmVzJy4KKwogMjAwOS0wMy0yOSAgRGFyaW4gQWRs ZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgQW5vdGhlciBhdHRlbXB0IHRvIGZpeCB0 aGUgUXQgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERP TVdpbmRvd0N1c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERPTVdpbmRv d0N1c3RvbS5jcHAKaW5kZXggMDA3ZWQyNC4uZDAzMWE1MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcApAQCAtMzIzLDQwICszMjMsNDAg QEAgQ0FMTEJBQ0tfRlVOQ19ERUNMKERPTVdpbmRvd1Nob3dNb2RhbERpYWxvZykKIAogICAgIEZs b2F0UmVjdCBzY3JlZW5SZWN0ID0gc2NyZWVuQXZhaWxhYmxlUmVjdChmcmFtZS0+dmlldygpKTsK IAotICAgIFdpbmRvd0ZlYXR1cmVzIGZlYXR1cmVzOworICAgIFdpbmRvd0ZlYXR1cmVzIHdpbmRv d0ZlYXR1cmVzOwogICAgIC8vIGRlZmF1bHQgaGVyZSBjYW1lIGZyb20gZnJhbWUgc2l6ZSBvZiBk aWFsb2cgaW4gTWFjSUUuCi0gICAgZmVhdHVyZXMud2lkdGggPSBXaW5kb3dGZWF0dXJlczo6Zmxv YXRGZWF0dXJlKGZlYXR1cmVzLCAiZGlhbG9nd2lkdGgiLCAxMDAsIHNjcmVlblJlY3Qud2lkdGgo KSwgNjIwKTsKLSAgICBmZWF0dXJlcy53aWR0aFNldCA9IHRydWU7CisgICAgd2luZG93RmVhdHVy ZXMud2lkdGggPSBXaW5kb3dGZWF0dXJlczo6ZmxvYXRGZWF0dXJlKGZlYXR1cmVzLCAiZGlhbG9n d2lkdGgiLCAxMDAsIHNjcmVlblJlY3Qud2lkdGgoKSwgNjIwKTsKKyAgICB3aW5kb3dGZWF0dXJl cy53aWR0aFNldCA9IHRydWU7CiAgICAgLy8gZGVmYXVsdCBoZXJlIGNhbWUgZnJvbSBmcmFtZSBz aXplIG9mIGRpYWxvZyBpbiBNYWNJRS4KLSAgICBmZWF0dXJlcy5oZWlnaHQgPSBXaW5kb3dGZWF0 dXJlczo6ZmxvYXRGZWF0dXJlKGZlYXR1cmVzLCAiZGlhbG9naGVpZ2h0IiwgMTAwLCBzY3JlZW5S ZWN0LmhlaWdodCgpLCA0NTApOwotICAgIGZlYXR1cmVzLmhlaWdodFNldCA9IHRydWU7CisgICAg d2luZG93RmVhdHVyZXMuaGVpZ2h0ID0gV2luZG93RmVhdHVyZXM6OmZsb2F0RmVhdHVyZShmZWF0 dXJlcywgImRpYWxvZ2hlaWdodCIsIDEwMCwgc2NyZWVuUmVjdC5oZWlnaHQoKSwgNDUwKTsKKyAg ICB3aW5kb3dGZWF0dXJlcy5oZWlnaHRTZXQgPSB0cnVlOwogICAKLSAgICBmZWF0dXJlcy54ID0g V2luZG93RmVhdHVyZXM6OmZsb2F0RmVhdHVyZShmZWF0dXJlcywgImRpYWxvZ2xlZnQiLCBzY3Jl ZW5SZWN0LngoKSwgc2NyZWVuUmVjdC5yaWdodCgpIC0gZmVhdHVyZXMud2lkdGgsIC0xKTsKLSAg ICBmZWF0dXJlcy54U2V0ID0gZmVhdHVyZXMueCA+IDA7Ci0gICAgZmVhdHVyZXMueSA9IFdpbmRv d0ZlYXR1cmVzOjpmbG9hdEZlYXR1cmUoZmVhdHVyZXMsICJkaWFsb2d0b3AiLCBzY3JlZW5SZWN0 LnkoKSwgc2NyZWVuUmVjdC5ib3R0b20oKSAtIGZlYXR1cmVzLmhlaWdodCwgLTEpOwotICAgIGZl YXR1cmVzLnlTZXQgPSBmZWF0dXJlcy55ID4gMDsKKyAgICB3aW5kb3dGZWF0dXJlcy54ID0gV2lu ZG93RmVhdHVyZXM6OmZsb2F0RmVhdHVyZShmZWF0dXJlcywgImRpYWxvZ2xlZnQiLCBzY3JlZW5S ZWN0LngoKSwgc2NyZWVuUmVjdC5yaWdodCgpIC0gd2luZG93RmVhdHVyZXMud2lkdGgsIC0xKTsK KyAgICB3aW5kb3dGZWF0dXJlcy54U2V0ID0gd2luZG93RmVhdHVyZXMueCA+IDA7CisgICAgd2lu ZG93RmVhdHVyZXMueSA9IFdpbmRvd0ZlYXR1cmVzOjpmbG9hdEZlYXR1cmUoZmVhdHVyZXMsICJk aWFsb2d0b3AiLCBzY3JlZW5SZWN0LnkoKSwgc2NyZWVuUmVjdC5ib3R0b20oKSAtIHdpbmRvd0Zl YXR1cmVzLmhlaWdodCwgLTEpOworICAgIHdpbmRvd0ZlYXR1cmVzLnlTZXQgPSB3aW5kb3dGZWF0 dXJlcy55ID4gMDsKIAogICAgIGlmIChXaW5kb3dGZWF0dXJlczo6Ym9vbEZlYXR1cmUoZmVhdHVy ZXMsICJjZW50ZXIiLCB0cnVlKSkgewotICAgICAgICBpZiAoIWZlYXR1cmVzLnhTZXQpIHsKLSAg ICAgICAgICAgIGZlYXR1cmVzLnggPSBzY3JlZW5SZWN0LngoKSArIChzY3JlZW5SZWN0LndpZHRo KCkgLSBmZWF0dXJlcy53aWR0aCkgLyAyOwotICAgICAgICAgICAgZmVhdHVyZXMueFNldCA9IHRy dWU7CisgICAgICAgIGlmICghd2luZG93RmVhdHVyZXMueFNldCkgeworICAgICAgICAgICAgd2lu ZG93RmVhdHVyZXMueCA9IHNjcmVlblJlY3QueCgpICsgKHNjcmVlblJlY3Qud2lkdGgoKSAtIHdp bmRvd0ZlYXR1cmVzLndpZHRoKSAvIDI7CisgICAgICAgICAgICB3aW5kb3dGZWF0dXJlcy54U2V0 ID0gdHJ1ZTsKICAgICAgICAgfQotICAgICAgICBpZiAoIWZlYXR1cmVzLnlTZXQpIHsKLSAgICAg ICAgICAgIGZlYXR1cmVzLnkgPSBzY3JlZW5SZWN0LnkoKSArIChzY3JlZW5SZWN0LmhlaWdodCgp IC0gZmVhdHVyZXMuaGVpZ2h0KSAvIDI7Ci0gICAgICAgICAgICBmZWF0dXJlcy55U2V0ID0gdHJ1 ZTsKKyAgICAgICAgaWYgKCF3aW5kb3dGZWF0dXJlcy55U2V0KSB7CisgICAgICAgICAgICB3aW5k b3dGZWF0dXJlcy55ID0gc2NyZWVuUmVjdC55KCkgKyAoc2NyZWVuUmVjdC5oZWlnaHQoKSAtIHdp bmRvd0ZlYXR1cmVzLmhlaWdodCkgLyAyOworICAgICAgICAgICAgd2luZG93RmVhdHVyZXMueVNl dCA9IHRydWU7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBmZWF0dXJlcy5kaWFsb2cgPSB0cnVl OwotICAgIGZlYXR1cmVzLnJlc2l6YWJsZSA9IFdpbmRvd0ZlYXR1cmVzOjpib29sRmVhdHVyZShm ZWF0dXJlcywgInJlc2l6YWJsZSIpOwotICAgIGZlYXR1cmVzLnNjcm9sbGJhcnNWaXNpYmxlID0g V2luZG93RmVhdHVyZXM6OmJvb2xGZWF0dXJlKGZlYXR1cmVzLCAic2Nyb2xsIiwgdHJ1ZSk7Ci0g ICAgZmVhdHVyZXMuc3RhdHVzQmFyVmlzaWJsZSA9IFdpbmRvd0ZlYXR1cmVzOjpib29sRmVhdHVy ZShmZWF0dXJlcywgInN0YXR1cyIsICF0cnVzdGVkKTsKLSAgICBmZWF0dXJlcy5tZW51QmFyVmlz aWJsZSA9IGZhbHNlOwotICAgIGZlYXR1cmVzLnRvb2xCYXJWaXNpYmxlID0gZmFsc2U7Ci0gICAg ZmVhdHVyZXMubG9jYXRpb25CYXJWaXNpYmxlID0gZmFsc2U7Ci0gICAgZmVhdHVyZXMuZnVsbHNj cmVlbiA9IGZhbHNlOworICAgIHdpbmRvd0ZlYXR1cmVzLmRpYWxvZyA9IHRydWU7CisgICAgd2lu ZG93RmVhdHVyZXMucmVzaXphYmxlID0gV2luZG93RmVhdHVyZXM6OmJvb2xGZWF0dXJlKGZlYXR1 cmVzLCAicmVzaXphYmxlIik7CisgICAgd2luZG93RmVhdHVyZXMuc2Nyb2xsYmFyc1Zpc2libGUg PSBXaW5kb3dGZWF0dXJlczo6Ym9vbEZlYXR1cmUoZmVhdHVyZXMsICJzY3JvbGwiLCB0cnVlKTsK KyAgICB3aW5kb3dGZWF0dXJlcy5zdGF0dXNCYXJWaXNpYmxlID0gV2luZG93RmVhdHVyZXM6OmJv b2xGZWF0dXJlKGZlYXR1cmVzLCAic3RhdHVzIiwgIXRydXN0ZWQpOworICAgIHdpbmRvd0ZlYXR1 cmVzLm1lbnVCYXJWaXNpYmxlID0gZmFsc2U7CisgICAgd2luZG93RmVhdHVyZXMudG9vbEJhclZp c2libGUgPSBmYWxzZTsKKyAgICB3aW5kb3dGZWF0dXJlcy5sb2NhdGlvbkJhclZpc2libGUgPSBm YWxzZTsKKyAgICB3aW5kb3dGZWF0dXJlcy5mdWxsc2NyZWVuID0gZmFsc2U7CiAKLSAgICBGcmFt ZSogZGlhbG9nRnJhbWUgPSBjcmVhdGVXaW5kb3coZnJhbWUsIHVybCwgIiIsIGZlYXR1cmVzLCBk aWFsb2dBcmdzKTsKKyAgICBGcmFtZSogZGlhbG9nRnJhbWUgPSBjcmVhdGVXaW5kb3coZnJhbWUs IHVybCwgIiIsIHdpbmRvd0ZlYXR1cmVzLCBkaWFsb2dBcmdzKTsKICAgICBpZiAoIWRpYWxvZ0Zy YW1lKQogICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogCg==