87607 2012-05-27 15:40:44 -0700 Minor code cleaning for the interface of MainResourceLoader 2012-05-27 21:24:26 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin japhet webkit.review.bot oldest_to_newest 634803 0 benjamin 2012-05-27 15:40:44 -0700 Minor code cleaning for the interface of MainResourceLoader 634805 1 144245 benjamin 2012-05-27 15:45:18 -0700 Created attachment 144245 Patch 634871 2 benjamin 2012-05-27 21:24:26 -0700 Committed r118644: <http://trac.webkit.org/changeset/118644> 144245 2012-05-27 15:45:18 -0700 2012-05-27 16:44:47 -0700 Patch bug-87607-20120527154517.patch text/plain 5484 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2I4YzIxZWUyODJhNzA3 YzhmOWZhM2VkNGEyOTQ5NjczYmQ0MmMwNS4uYzE4NzQ0MmFlN2Y0YmU3ZDk3NTZjMWRiZDBkYmQx NmUzNTYwMjc4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA1LTI3ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBNaW5vciBjb2Rl IGNsZWFuaW5nIGZvciB0aGUgaW50ZXJmYWNlIG9mIE1haW5SZXNvdXJjZUxvYWRlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc2MDcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxvYWRlci9NYWluUmVz b3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVyOjpN YWluUmVzb3VyY2VMb2FkZXIpOgorICAgICAgICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVy OjpoYW5kbGVTdWJzdGl0dXRlRGF0YUxvYWROb3cpOgorICAgICAgICAoV2ViQ29yZTo6TWFpblJl c291cmNlTG9hZGVyOjpoYW5kbGVTdWJzdGl0dXRlRGF0YUxvYWRTb29uKToKKyAgICAgICAgKiBs b2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmg6CisgICAgICAgIChNYWluUmVzb3VyY2VMb2FkZXIp OgorICAgICAgICAtQWRkIHRoZSBPVkVSUklERSBrZXl3b3JkIGZvciB0aGUgbWV0aG9kcyBpbmhl cml0ZWQgZnJvbSBSZXNvdXJjZUxvYWRlci4KKyAgICAgICAgLVJlbW92ZSB0aGUgdXNlbGVzcyBk ZWNsYXJhdGlvbiBvZiBoYW5kbGVEYXRhTG9hZChSZXNvdXJjZVJlcXVlc3QmKSwgdGhpcyBtZXRo b2QgZG9lcyBub3QgZXhpc3QuCisgICAgICAgIC1SZW5hbWUgaGFuZGxlRGF0YUxvYWROb3coKSB0 byBoYW5kbGVTdWJzdGl0dXRlRGF0YUxvYWROb3coKSBhbmQgbWFrZSB0aGUgbWV0aG9kIHByaXZh dGUuIFRoaXMgc2hvdWxkCisgICAgICAgICBvbmx5IGJlIHVzZWQgYnkgaGFuZGxlU3Vic3RpdHV0 ZURhdGFMb2FkU29vbigpIGFuZCBpbmRpcmVjdGx5IHRocm91Z2ggdGhlIHRpbWVyLgorCiAyMDEy LTA1LTI3ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFdoZW4gcGFnZXMgYXJlIGxvYWRlZCBmcm9tIEFwcENhY2hlIHdpdGggRGVmZXJyZWRMb2FkaW5n LCB3aWxsU2VuZFJlcXVlc3QoKSBpcyBuZXZlciBjYWxsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggYjc3N2Q2ZTNkZTcxYjcxZTUwZTQxYjE0 M2EyODYyMzcyN2VhZWNiZC4uNTdkMDExMzRiZTU4NWJiOWMxOTQ1NjljMTAzMDQ2OGRhMmM4YWM5 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKQEAg LTcyLDcgKzcyLDcgQEAgc3RhdGljIGJvb2wgc2hvdWxkTG9hZEFzRW1wdHlEb2N1bWVudChjb25z dCBLVVJMJiB1cmwpCiAKIE1haW5SZXNvdXJjZUxvYWRlcjo6TWFpblJlc291cmNlTG9hZGVyKEZy YW1lKiBmcmFtZSkKICAgICA6IFJlc291cmNlTG9hZGVyKGZyYW1lLCBSZXNvdXJjZUxvYWRlck9w dGlvbnMoU2VuZENhbGxiYWNrcywgU25pZmZDb250ZW50LCBCdWZmZXJEYXRhLCBBbGxvd1N0b3Jl ZENyZWRlbnRpYWxzLCBBc2tDbGllbnRGb3JDcm9zc09yaWdpbkNyZWRlbnRpYWxzLCBTa2lwU2Vj dXJpdHlDaGVjaykpCi0gICAgLCBtX2RhdGFMb2FkVGltZXIodGhpcywgJk1haW5SZXNvdXJjZUxv YWRlcjo6aGFuZGxlRGF0YUxvYWROb3cpCisgICAgLCBtX2RhdGFMb2FkVGltZXIodGhpcywgJk1h aW5SZXNvdXJjZUxvYWRlcjo6aGFuZGxlU3Vic3RpdHV0ZURhdGFMb2FkTm93KQogICAgICwgbV9s b2FkaW5nTXVsdGlwYXJ0Q29udGVudChmYWxzZSkKICAgICAsIG1fd2FpdGluZ0ZvckNvbnRlbnRQ b2xpY3koZmFsc2UpCiAgICAgLCBtX3RpbWVPZkxhc3REYXRhUmVjZWl2ZWQoMC4wKQpAQCAtNTgw LDcgKzU4MCw3IEBAIHZvaWQgTWFpblJlc291cmNlTG9hZGVyOjpoYW5kbGVFbXB0eUxvYWQoY29u c3QgS1VSTCYgdXJsLCBib29sIGZvclVSTFNjaGVtZSkKICAgICBkaWRSZWNlaXZlUmVzcG9uc2Uo cmVzcG9uc2UpOwogfQogCi12b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6aGFuZGxlRGF0YUxvYWRO b3coTWFpblJlc291cmNlTG9hZGVyVGltZXIqKQordm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6Omhh bmRsZVN1YnN0aXR1dGVEYXRhTG9hZE5vdyhNYWluUmVzb3VyY2VMb2FkZXJUaW1lciopCiB7CiAg ICAgUmVmUHRyPE1haW5SZXNvdXJjZUxvYWRlcj4gcHJvdGVjdCh0aGlzKTsKIApAQCAtNjEzLDcg KzYxMyw3IEBAIHZvaWQgTWFpblJlc291cmNlTG9hZGVyOjpoYW5kbGVTdWJzdGl0dXRlRGF0YUxv YWRTb29uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcikKICAgICBpZiAobV9kb2N1bWVudExvYWRl ci0+ZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCgpKQogICAgICAgICBzdGFydERhdGFMb2FkVGlt ZXIoKTsKICAgICBlbHNlCi0gICAgICAgIGhhbmRsZURhdGFMb2FkTm93KDApOworICAgICAgICBo YW5kbGVTdWJzdGl0dXRlRGF0YUxvYWROb3coMCk7CiB9CiAKIGJvb2wgTWFpblJlc291cmNlTG9h ZGVyOjpsb2FkTm93KFJlc291cmNlUmVxdWVzdCYgcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9N YWluUmVzb3VyY2VMb2FkZXIuaAppbmRleCAxMzFhYmJlNzYxNjZlZGNjZDM4OTIxZjdhZTU5OWVl OGY4M2Q1YWJlLi5mMDA1ZGRjM2EzYjZhNDcyMTBkNjU5YjVhY2MyMTI2Y2E0MzY3NTA3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCkBAIC01NSwxNSArNTUs MTUgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2aXJ0dWFsIH5NYWluUmVzb3VyY2VM b2FkZXIoKTsKIAogICAgICAgICB2b2lkIGxvYWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgY29u c3QgU3Vic3RpdHV0ZURhdGEmKTsKLSAgICAgICAgdmlydHVhbCB2b2lkIGFkZERhdGEoY29uc3Qg Y2hhciosIGludCwgYm9vbCBhbGxBdE9uY2UpOworICAgICAgICB2aXJ0dWFsIHZvaWQgYWRkRGF0 YShjb25zdCBjaGFyKiwgaW50LCBib29sIGFsbEF0T25jZSkgT1ZFUlJJREU7CiAKLSAgICAgICAg dmlydHVhbCB2b2lkIHNldERlZmVyc0xvYWRpbmcoYm9vbCk7CisgICAgICAgIHZpcnR1YWwgdm9p ZCBzZXREZWZlcnNMb2FkaW5nKGJvb2wpIE9WRVJSSURFOwogCi0gICAgICAgIHZpcnR1YWwgdm9p ZCB3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYgcmVkaXJlY3RSZXNwb25zZSk7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlUmVz cG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwotICAgICAgICB2aXJ0dWFsIHZvaWQgZGlk UmVjZWl2ZURhdGEoY29uc3QgY2hhciosIGludCwgbG9uZyBsb25nIGVuY29kZWREYXRhTGVuZ3Ro LCBib29sIGFsbEF0T25jZSk7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2FkaW5n KGRvdWJsZSBmaW5pc2hUaW1lKTsKLSAgICAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoY29uc3Qg UmVzb3VyY2VFcnJvciYpOworICAgICAgICB2aXJ0dWFsIHZvaWQgd2lsbFNlbmRSZXF1ZXN0KFJl c291cmNlUmVxdWVzdCYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2Up IE9WRVJSSURFOworICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0 IFJlc291cmNlUmVzcG9uc2UmKSBPVkVSUklERTsKKyAgICAgICAgdmlydHVhbCB2b2lkIGRpZFJl Y2VpdmVEYXRhKGNvbnN0IGNoYXIqLCBpbnQsIGxvbmcgbG9uZyBlbmNvZGVkRGF0YUxlbmd0aCwg Ym9vbCBhbGxBdE9uY2UpIE9WRVJSSURFOworICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNo TG9hZGluZyhkb3VibGUgZmluaXNoVGltZSkgT1ZFUlJJREU7CisgICAgICAgIHZpcnR1YWwgdm9p ZCBkaWRGYWlsKGNvbnN0IFJlc291cmNlRXJyb3ImKSBPVkVSUklERTsKIAogI2lmIEhBVkUoUlVO TE9PUF9USU1FUikKICAgICAgICAgdHlwZWRlZiBSdW5Mb29wVGltZXI8TWFpblJlc291cmNlTG9h ZGVyPiBNYWluUmVzb3VyY2VMb2FkZXJUaW1lcjsKQEAgLTcxLDIzICs3MSwyMSBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIHR5cGVkZWYgVGltZXI8TWFpblJlc291cmNlTG9hZGVyPiBN YWluUmVzb3VyY2VMb2FkZXJUaW1lcjsKICNlbmRpZgogCi0gICAgICAgIHZvaWQgaGFuZGxlRGF0 YUxvYWROb3coTWFpblJlc291cmNlTG9hZGVyVGltZXIqKTsKLQogICAgICAgICBib29sIGlzTG9h ZGluZ011bHRpcGFydENvbnRlbnQoKSBjb25zdCB7IHJldHVybiBtX2xvYWRpbmdNdWx0aXBhcnRD b250ZW50OyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBNYWluUmVzb3VyY2VMb2FkZXIoRnJh bWUqKTsKIAotICAgICAgICB2aXJ0dWFsIHZvaWQgd2lsbENhbmNlbChjb25zdCBSZXNvdXJjZUVy cm9yJik7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRDYW5jZWwoY29uc3QgUmVzb3VyY2VFcnJv ciYpOworICAgICAgICB2aXJ0dWFsIHZvaWQgd2lsbENhbmNlbChjb25zdCBSZXNvdXJjZUVycm9y JikgT1ZFUlJJREU7CisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRDYW5jZWwoY29uc3QgUmVzb3Vy Y2VFcnJvciYpIE9WRVJSSURFOwogCiAgICAgICAgIGJvb2wgbG9hZE5vdyhSZXNvdXJjZVJlcXVl c3QmKTsKIAogICAgICAgICB2b2lkIGhhbmRsZUVtcHR5TG9hZChjb25zdCBLVVJMJiwgYm9vbCBm b3JVUkxTY2hlbWUpOwogICAgICAgICB2b2lkIGhhbmRsZVN1YnN0aXR1dGVEYXRhTG9hZFNvb24o Y29uc3QgUmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgICAgIHZvaWQgaGFuZGxlU3Vic3RpdHV0ZURh dGFMb2FkTm93KE1haW5SZXNvdXJjZUxvYWRlclRpbWVyKik7CiAKICAgICAgICAgdm9pZCBzdGFy dERhdGFMb2FkVGltZXIoKTsKLSAgICAgICAgdm9pZCBoYW5kbGVEYXRhTG9hZChSZXNvdXJjZVJl cXVlc3QmKTsKIAogICAgICAgICB2b2lkIHJlY2VpdmVkRXJyb3IoY29uc3QgUmVzb3VyY2VFcnJv ciYpOwogICAgICAgICBSZXNvdXJjZUVycm9yIGludGVycnVwdGVkRm9yUG9saWN5Q2hhbmdlRXJy b3IoKSBjb25zdDsK