30533 2009-10-19 13:58:24 -0700 Remove ResourceLoadNotifier::activeDocumentLoader 2009-10-19 18:30:03 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 29947 1 abarth abarth darin eric oldest_to_newest 155883 0 abarth 2009-10-19 13:58:24 -0700 As requested by Darin Adler. 155884 1 41447 abarth 2009-10-19 14:00:37 -0700 Created attachment 41447 Patch v1 155887 2 41447 eric 2009-10-19 14:04:01 -0700 Comment on attachment 41447 Patch v1 Looks OK to me. 155997 3 darin 2009-10-19 17:24:01 -0700 Thanks! 156015 4 abarth 2009-10-19 18:30:03 -0700 Committed r49829: <http://trac.webkit.org/changeset/49829> 41447 2009-10-19 14:00:37 -0700 2009-10-19 14:04:00 -0700 Patch v1 bug-30533-20091019140034.patch text/plain 6728 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDVlNGMzZi4uZDJkYTM5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0xMC0xOCAgQWRhbSBCYXJ0aCAg PGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlbW92ZSBSZXNvdXJjZUxvYWROb3RpZmllcjo6YWN0aXZlRG9jdW1lbnRM b2FkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMw NTMzCisKKyAgICAgICAgUmVtb3ZpbmcgdGhpcyBtZXRob2QgZnJvbSBSZXNvdXJjZUxvYWROb3Rp ZmllciBiZXR0ZXIgZGVjb3VwbGVzIHRoZQorICAgICAgICBub3RpZmllciBmcm9tIEZyYW1lTG9h ZGVyLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyOjpjb250aW51ZUxvYWRBZnRlcldpbGxTdWJtaXRGb3JtKToKKyAgICAg ICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpyZXF1ZXN0RnJvbURlbGVnYXRlKToKKyAgICAgICAg KiBsb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VMb2FkTm90aWZpZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgICogbG9hZGVy L1Jlc291cmNlTG9hZE5vdGlmaWVyLmg6CisgICAgICAgICogbG9hZGVyL1Jlc291cmNlTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3Qp OgorCiAyMDA5LTEwLTE3ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAgYi9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXgg MTI1OTliNS4uMzgzOWE2OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMjkzOSw3ICsyOTM5 LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29udGludWVMb2FkQWZ0ZXJXaWxsU3VibWl0Rm9ybSgp CiAKICAgICBpZiAoUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKSkgewogICAgICAgICBpZGVu dGlmaWVyID0gcGFnZS0+cHJvZ3Jlc3MoKS0+Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOwotICAg ICAgICBub3RpZmllcigpLT5kaXNwYXRjaEFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0 KGlkZW50aWZpZXIsIG1fcHJvdmlzaW9uYWxEb2N1bWVudExvYWRlci5nZXQoKSwgbV9wcm92aXNp b25hbERvY3VtZW50TG9hZGVyLT5vcmlnaW5hbFJlcXVlc3QoKSk7CisgICAgICAgIG5vdGlmaWVy KCktPmFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0KGlkZW50aWZpZXIsIG1fcHJvdmlz aW9uYWxEb2N1bWVudExvYWRlci5nZXQoKSwgbV9wcm92aXNpb25hbERvY3VtZW50TG9hZGVyLT5v cmlnaW5hbFJlcXVlc3QoKSk7CiAgICAgfQogCiAgICAgaWYgKCFtX3Byb3Zpc2lvbmFsRG9jdW1l bnRMb2FkZXItPnN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZShpZGVudGlmaWVyKSkKQEAgLTM0NzUs NyArMzQ3NSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OnJlcXVlc3RGcm9tRGVsZWdhdGUoUmVzb3Vy Y2VSZXF1ZXN0JiByZXF1ZXN0LCB1bnNpZ25lZCBsb25nJiBpCiAgICAgaWRlbnRpZmllciA9IDA7 CiAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpIHsKICAgICAgICAgaWRlbnRp ZmllciA9IHBhZ2UtPnByb2dyZXNzKCktPmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXIoKTsKLSAgICAg ICAgbm90aWZpZXIoKS0+ZGlzcGF0Y2hBc3NpZ25JZGVudGlmaWVyVG9Jbml0aWFsUmVxdWVzdChp ZGVudGlmaWVyLCBtX2RvY3VtZW50TG9hZGVyLmdldCgpLCByZXF1ZXN0KTsKKyAgICAgICAgbm90 aWZpZXIoKS0+YXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QoaWRlbnRpZmllciwgbV9k b2N1bWVudExvYWRlci5nZXQoKSwgcmVxdWVzdCk7CiAgICAgfQogCiAgICAgUmVzb3VyY2VSZXF1 ZXN0IG5ld1JlcXVlc3QocmVxdWVzdCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWROb3RpZmllci5jcHAgYi9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmll ci5jcHAKaW5kZXggN2MxYWE0MC4uNDQ1MGU5ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZE5vdGlmaWVyLmNwcApAQCAtNTcsMTEgKzU3LDYgQEAgdm9pZCBSZXNvdXJjZUxvYWROb3RpZmll cjo6ZGlkQ2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoUmVzb3VyY2VMb2FkZXIqIGxvYWQK ICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPmRpc3BhdGNoRGlkQ2FuY2VsQXV0aGVu dGljYXRpb25DaGFsbGVuZ2UobG9hZGVyLT5kb2N1bWVudExvYWRlcigpLCBsb2FkZXItPmlkZW50 aWZpZXIoKSwgY3VycmVudFdlYkNoYWxsZW5nZSk7CiB9CiAKLXZvaWQgUmVzb3VyY2VMb2FkTm90 aWZpZXI6OmFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBjbGllbnRSZXF1ZXN0KQotewotICAgIGRp c3BhdGNoQXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJlcXVlc3QoaWRlbnRpZmllciwgYWN0aXZl RG9jdW1lbnRMb2FkZXIoKSwgY2xpZW50UmVxdWVzdCk7Ci19Ci0KIHZvaWQgUmVzb3VyY2VMb2Fk Tm90aWZpZXI6OndpbGxTZW5kUmVxdWVzdChSZXNvdXJjZUxvYWRlciogbG9hZGVyLCBSZXNvdXJj ZVJlcXVlc3QmIGNsaWVudFJlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0 UmVzcG9uc2UpCiB7CiAgICAgbV9mcmFtZS0+bG9hZGVyKCktPmFwcGx5VXNlckFnZW50KGNsaWVu dFJlcXVlc3QpOwpAQCAtNzEsNyArNjYsNyBAQCB2b2lkIFJlc291cmNlTG9hZE5vdGlmaWVyOjp3 aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VMb2FkZXIqIGxvYWRlciwgUmVzb3VyY2VSZXF1ZQogCiB2 b2lkIFJlc291cmNlTG9hZE5vdGlmaWVyOjpkaWRSZWNlaXZlUmVzcG9uc2UoUmVzb3VyY2VMb2Fk ZXIqIGxvYWRlciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcikKIHsKLSAgICBhY3RpdmVEb2N1 bWVudExvYWRlcigpLT5hZGRSZXNwb25zZShyKTsKKyAgICBsb2FkZXItPmRvY3VtZW50TG9hZGVy KCktPmFkZFJlc3BvbnNlKHIpOwogCiAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdl KCkpCiAgICAgICAgIHBhZ2UtPnByb2dyZXNzKCktPmluY3JlbWVudFByb2dyZXNzKGxvYWRlci0+ aWRlbnRpZmllcigpLCByKTsKQEAgLTE3OSw5ICsxNzQsNCBAQCB2b2lkIFJlc291cmNlTG9hZE5v dGlmaWVyOjpzZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhEb2N1bWVudExvYWRlciogbG9h ZGVyLAogICAgICAgICBtX2ZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPmRpc3BhdGNoRGlkRmFp bExvYWRpbmcobG9hZGVyLCBpZGVudGlmaWVyLCBlcnJvcik7CiB9CiAKLURvY3VtZW50TG9hZGVy KiBSZXNvdXJjZUxvYWROb3RpZmllcjo6YWN0aXZlRG9jdW1lbnRMb2FkZXIoKSBjb25zdAotewot ICAgIHJldHVybiBtX2ZyYW1lLT5sb2FkZXIoKS0+YWN0aXZlRG9jdW1lbnRMb2FkZXIoKTsKLX0K LQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkTm90aWZpZXIuaCBiL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVy LmgKaW5kZXggMmQ5NDEyYy4uYjhmMDc4YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkTm90aWZpZXIuaAorKysgYi9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3Rp Zmllci5oCkBAIC01MCw3ICs1MCw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZFJlY2VpdmVBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZShSZXNvdXJjZUxvYWRlciosIGNvbnN0IEF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlJik7CiAgICAgdm9pZCBkaWRDYW5jZWxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShS ZXNvdXJjZUxvYWRlciosIGNvbnN0IEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJik7CiAKLSAgICB2 b2lkIGFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0KHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgdm9pZCB3aWxsU2VuZFJlcXVlc3Qo UmVzb3VyY2VMb2FkZXIqLCBSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNl JiByZWRpcmVjdFJlc3BvbnNlKTsKICAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJj ZUxvYWRlciosIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICB2b2lkIGRpZFJlY2VpdmVE YXRhKFJlc291cmNlTG9hZGVyKiwgY29uc3QgY2hhciosIGludCwgaW50IGxlbmd0aFJlY2VpdmVk KTsKQEAgLTU4LDcgKzU3LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkRmFpbFRvTG9hZChSZXNv dXJjZUxvYWRlciosIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKICAgICB2b2lkIGRpZExvYWRSZXNv dXJjZUJ5WE1MSHR0cFJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBTY3Jp cHRTdHJpbmcmIHNvdXJjZVN0cmluZyk7CiAKLSAgICB2b2lkIGRpc3BhdGNoQXNzaWduSWRlbnRp ZmllclRvSW5pdGlhbFJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExv YWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOworICAgIHZvaWQgYXNzaWduSWRlbnRpZmll clRvSW5pdGlhbFJlcXVlc3QodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRl ciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOwogICAgIHZvaWQgZGlzcGF0Y2hXaWxsU2VuZFJl cXVlc3QoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNl UmVxdWVzdCYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpOwogICAg IHZvaWQgZGlzcGF0Y2hEaWRSZWNlaXZlUmVzcG9uc2UoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25l ZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKTsKICAgICB2b2lkIGRp c3BhdGNoRGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGgoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGludCBsZW5ndGgpOwpAQCAtNjcsOCArNjYsNiBAQCBwdWJsaWM6CiAg ICAgdm9pZCBzZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhEb2N1bWVudExvYWRlciosIHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIGludCBsZW5n dGgsIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKIAogcHJpdmF0ZToKLSAgICBpbmxpbmUgRG9jdW1l bnRMb2FkZXIqIGFjdGl2ZURvY3VtZW50TG9hZGVyKCkgY29uc3Q7Ci0KICAgICBGcmFtZSogbV9m cmFtZTsKIH07CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNw cCBiL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCA1NWQyNDNhLi45MjQ0 Y2YwIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlci5jcHAKKysrIGIv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0xOTcsMTggKzE5NywxOCBAQCB2 b2lkIFJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBjb25zdCBSZXNvdXJjZVJlcwogICAgIC8vIFByb3RlY3QgdGhpcyBpbiB0aGlzIGRlbGVn YXRlIG1ldGhvZCBzaW5jZSB0aGUgYWRkaXRpb25hbCBwcm9jZXNzaW5nIGNhbiBkbwogICAgIC8v IGFueXRoaW5nIGluY2x1ZGluZyBwb3NzaWJseSBkZXJlZmluZyB0aGlzOyBvbmUgZXhhbXBsZSBv ZiB0aGlzIGlzIFJhZGFyIDMyNjYyMTYuCiAgICAgUmVmUHRyPFJlc291cmNlTG9hZGVyPiBwcm90 ZWN0b3IodGhpcyk7Ci0gICAgICAgIAorCiAgICAgQVNTRVJUKCFtX3JlYWNoZWRUZXJtaW5hbFN0 YXRlKTsKIAogICAgIGlmIChtX3NlbmRSZXNvdXJjZUxvYWRDYWxsYmFja3MpIHsKICAgICAgICAg aWYgKCFtX2lkZW50aWZpZXIpIHsKICAgICAgICAgICAgIG1faWRlbnRpZmllciA9IG1fZnJhbWUt PnBhZ2UoKS0+cHJvZ3Jlc3MoKS0+Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOwotICAgICAgICAg ICAgZnJhbWVMb2FkZXIoKS0+bm90aWZpZXIoKS0+YXNzaWduSWRlbnRpZmllclRvSW5pdGlhbFJl cXVlc3QobV9pZGVudGlmaWVyLCByZXF1ZXN0KTsKKyAgICAgICAgICAgIGZyYW1lTG9hZGVyKCkt Pm5vdGlmaWVyKCktPmFzc2lnbklkZW50aWZpZXJUb0luaXRpYWxSZXF1ZXN0KG1faWRlbnRpZmll ciwgZG9jdW1lbnRMb2FkZXIoKSwgcmVxdWVzdCk7CiAgICAgICAgIH0KIAogICAgICAgICBmcmFt ZUxvYWRlcigpLT5ub3RpZmllcigpLT53aWxsU2VuZFJlcXVlc3QodGhpcywgcmVxdWVzdCwgcmVk aXJlY3RSZXNwb25zZSk7CiAgICAgfQotICAgIAorCiAgICAgbV9yZXF1ZXN0ID0gcmVxdWVzdDsK IH0=