46186 2010-09-21 07:24:53 -0700 [Qt] window.close() doesn't work in qt 2010-10-15 12:55:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P3 Normal --- 31552 1 qi.2.zhang qi.2.zhang ademar commit-queue cshu hausmann jturcotte kling laszlo.gombos oldest_to_newest 282295 0 qi.2.zhang 2010-09-21 07:24:53 -0700 QWebSettings doesn't provide attribute to trigger "setAllowScriptsToCloseWindows" in settings.h. See bug http://bugs.nokia-boston.com/bugzilla/process_bug.cgi, #4731 282307 1 68240 qi.2.zhang 2010-09-21 07:40:15 -0700 Created attachment 68240 patch Introduce a new attribute in QWebSetting to let application can trigger "setAllowScriptsToCloseWindow" to make window.close() works. 282310 2 68240 tonikitoo 2010-09-21 08:08:29 -0700 Comment on attachment 68240 patch I need documentation at least (and of course an API review). 282312 3 qi.2.zhang 2010-09-21 08:11:43 -0700 What documentation I need to prepare, can you give me a detail instruction? This is first time I try to modify a API. 282313 4 tonikitoo 2010-09-21 08:14:06 -0700 Sure. For example, for all other members of the same enum, see their respective documentation in qwebsettings.cpp 282320 5 68242 qi.2.zhang 2010-09-21 08:35:07 -0700 Created attachment 68242 patch2 Update the documentation in QWebSettings to create a new patch. Thanks. 285317 6 68242 abarth 2010-09-26 22:24:48 -0700 Comment on attachment 68242 patch2 ok 285430 7 68242 commit-queue 2010-09-27 06:49:54 -0700 Comment on attachment 68242 patch2 Rejecting patch 68242 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'apply-attachment', '--force-clean', '--non-interactive', '--quiet', 68242]" exit_code: 2 Cleaning working directory Updating working directory Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=68242&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=46186&ctype=xml Processing 1 patch from 1 bug. Processing patch 68242 from bug 46186. Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Adam Barth', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/4070132 285431 8 68242 vestbo 2010-09-27 06:52:37 -0700 Comment on attachment 68242 patch2 This should follow the naming of JavascriptCanOpenWindows, especiallt if the functionality is symetric with regards to user-initiated gestures, etc 286126 9 jturcotte 2010-09-28 02:03:09 -0700 Result of investigations following the API review: JavascriptCanOpenWindows affects only non-user-initiated window.open tentatives. Currently in the implementation, Settings::allowScriptsToCloseWindows() allows the window to be closed only if the window was opened by the script and if the user didn't navigate/load any other page on this window. I think that these two behaviors are related enough to use the symetrical enum name JavascriptCanCloseWindows to wrap Settings::setAllowScriptsToCloseWindows(). 294760 10 70868 qi.2.zhang 2010-10-15 08:33:19 -0700 Created attachment 70868 patch3 Created a new patch based on Jocelyn's comments. 294764 11 70868 kling 2010-10-15 08:39:34 -0700 Comment on attachment 70868 patch3 View in context: https://bugs.webkit.org/attachment.cgi?id=70868&action=review > WebKit/qt/Api/qwebsettings.h:58 > + JavascriptCanCloseWindows, This will break binary compatibility. Add it after the existing enum values instead. 294767 12 70870 qi.2.zhang 2010-10-15 08:48:38 -0700 Created attachment 70870 patch4 new patch based on Andreas Kling's comments. 294771 13 70870 kling 2010-10-15 09:13:32 -0700 Comment on attachment 70870 patch4 Nice, r=me 294778 14 70870 commit-queue 2010-10-15 09:27:36 -0700 Comment on attachment 70870 patch4 Clearing flags on attachment: 70870 Committed r69856: <http://trac.webkit.org/changeset/69856> 294780 15 commit-queue 2010-10-15 09:27:45 -0700 All reviewed patches have been landed. Closing bug. 294871 16 ademar 2010-10-15 12:55:40 -0700 Revision r69856 cherry-picked into qtwebkit-2.1 with commit 42e90ac <http://gitorious.org/webkit/qtwebkit/commit/42e90ac> 68240 2010-09-21 07:40:15 -0700 2010-09-21 08:35:07 -0700 patch bug46186.patch text/plain 1909 qi.2.zhang SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjc5NTEpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDktMjEgIFFpIFpoYW5nICA8cWkuMi56aGFuZ0Bu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XSB3aW5kb3cuY2xvc2UoKSBkb2Vzbid0IHdvcmsgaW4gcXQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTg2CisKKyAgICAgICAgSW50cm9k dWNlIG5ldyBhdHRyaWJ1dGUgaW4gUVdlYlNldHRpbmdzIHRvIHRyaWdnZXIgInNldEFsbG93U2Ny aXB0c1RvQ2xvc2VXaW5kb3ciCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6CisgICAg ICAgIChRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSk6CisgICAgICAgICogQXBpL3F3ZWJzZXR0 aW5ncy5oOgorCiAyMDEwLTA5LTIwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCkluZGV4OiBXZWJLaXQv cXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2Vi c2V0dGluZ3MuY3BwCShyZXZpc2lvbiA2Nzg3OSkKKysrIFdlYktpdC9xdC9BcGkvcXdlYnNldHRp bmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU4LDYgKzI1OCwxMCBAQCB2b2lkIFFXZWJTZXR0 aW5nc1ByaXZhdGU6OmFwcGx5KCkKICAgICAgICAgc2V0dGluZ3MtPnNldE5lZWRzU2l0ZVNwZWNp ZmljUXVpcmtzKHZhbHVlKTsKIAogICAgICAgICBzZXR0aW5ncy0+c2V0VXNlc1BhZ2VDYWNoZShX ZWJDb3JlOjpwYWdlQ2FjaGUoKS0+Y2FwYWNpdHkoKSk7CisKKyAgICAgICAgdmFsdWUgPSBhdHRy aWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6QWxsb3dTY3JpcHRzVG9DbG9zZVdpbmRvd3MsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdsb2JhbC0+YXR0cmlidXRlcy52 YWx1ZShRV2ViU2V0dGluZ3M6OkFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzKSk7CisgICAgICAg IHNldHRpbmdzLT5zZXRBbGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93cyh2YWx1ZSk7CiAgICAgfSBl bHNlIHsKICAgICAgICAgUUxpc3Q8UVdlYlNldHRpbmdzUHJpdmF0ZSo+IHNldHRpbmdzID0gKjo6 YWxsU2V0dGluZ3MoKTsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBzZXR0aW5ncy5jb3Vu dCgpOyArK2kpCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmgJKHJldmlzaW9uIDY3ODc5KQorKysgV2Vi S2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtNzUsNyArNzUsOCBA QCBwdWJsaWM6CiAgICAgICAgIFRpbGVkQmFja2luZ1N0b3JlRW5hYmxlZCwKICAgICAgICAgRnJh bWVGbGF0dGVuaW5nRW5hYmxlZCwKICAgICAgICAgU2l0ZVNwZWNpZmljUXVpcmtzRW5hYmxlZCwK LSAgICAgICAgV2ViR0xFbmFibGVkCisgICAgICAgIFdlYkdMRW5hYmxlZCwKKyAgICAgICAgQWxs b3dTY3JpcHRzVG9DbG9zZVdpbmRvd3MKICAgICB9OwogICAgIGVudW0gV2ViR3JhcGhpYyB7CiAg ICAgICAgIE1pc3NpbmdJbWFnZUdyYXBoaWMsCg== 68242 2010-09-21 08:35:07 -0700 2010-10-15 08:33:19 -0700 patch2 bug46186_2.patch text/plain 2285 qi.2.zhang SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjc5NTEpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDktMjEgIFFpIFpoYW5nICA8cWkuMi56aGFuZ0Bu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XSB3aW5kb3cuY2xvc2UoKSBkb2Vzbid0IHdvcmsgaW4gcXQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTg2CisKKyAgICAgICAgSW50cm9k dWNlIG5ldyBhdHRyaWJ1dGUgaW4gUVdlYlNldHRpbmdzIHRvIHRyaWdnZXIgInNldEFsbG93U2Ny aXB0c1RvQ2xvc2VXaW5kb3ciCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5jcHA6CisgICAg ICAgIChRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSk6CisgICAgICAgICogQXBpL3F3ZWJzZXR0 aW5ncy5oOgorCiAyMDEwLTA5LTIwICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCkluZGV4OiBXZWJLaXQv cXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2Vi c2V0dGluZ3MuY3BwCShyZXZpc2lvbiA2Nzg3OSkKKysrIFdlYktpdC9xdC9BcGkvcXdlYnNldHRp bmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU4LDYgKzI1OCwxMCBAQCB2b2lkIFFXZWJTZXR0 aW5nc1ByaXZhdGU6OmFwcGx5KCkKICAgICAgICAgc2V0dGluZ3MtPnNldE5lZWRzU2l0ZVNwZWNp ZmljUXVpcmtzKHZhbHVlKTsKIAogICAgICAgICBzZXR0aW5ncy0+c2V0VXNlc1BhZ2VDYWNoZShX ZWJDb3JlOjpwYWdlQ2FjaGUoKS0+Y2FwYWNpdHkoKSk7CisKKyAgICAgICAgdmFsdWUgPSBhdHRy aWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6QWxsb3dTY3JpcHRzVG9DbG9zZVdpbmRvd3MsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdsb2JhbC0+YXR0cmlidXRlcy52 YWx1ZShRV2ViU2V0dGluZ3M6OkFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzKSk7CisgICAgICAg IHNldHRpbmdzLT5zZXRBbGxvd1NjcmlwdHNUb0Nsb3NlV2luZG93cyh2YWx1ZSk7CiAgICAgfSBl bHNlIHsKICAgICAgICAgUUxpc3Q8UVdlYlNldHRpbmdzUHJpdmF0ZSo+IHNldHRpbmdzID0gKjo6 YWxsU2V0dGluZ3MoKTsKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBzZXR0aW5ncy5jb3Vu dCgpOyArK2kpCkBAIC00NDEsNiArNDQ1LDggQEAgUVdlYlNldHRpbmdzKiBRV2ViU2V0dGluZ3M6 Omdsb2JhbFNldHRpbgogICAgICAgICBUaGlzIGlzIGRpc2FibGVkIGJ5IGRlZmF1bHQuCiAgICAg XHZhbHVlIFNpdGVTcGVjaWZpY1F1aXJrc0VuYWJsZWQgVGhpcyBzZXR0aW5nIGVuYWJsZXMgV2Vi S2l0J3Mgd29ya2Fyb3VuZCBmb3IgYnJva2VuIHNpdGVzLiBJdCBpcwogICAgICAgICBlbmFibGVk IGJ5IGRlZmF1bHQuCisgICAgXHZhbHVlIEFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dzIFNwZWNp ZmllcyB3aGV0aGVyIEphdmFTY3JpcHQgcHJvZ3JhbXMKKyAgICAgICAgY2FuIGNsb3NlIHdpbmRv d3MuIFRoaXMgaXMgZGlzYWJsZWQgYnkgZGVmYXVsdC4KICovCiAKIC8qIQpJbmRleDogV2ViS2l0 L3F0L0FwaS9xd2Vic2V0dGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJz ZXR0aW5ncy5oCShyZXZpc2lvbiA2Nzg3OSkKKysrIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdz LmgJKHdvcmtpbmcgY29weSkKQEAgLTc1LDcgKzc1LDggQEAgcHVibGljOgogICAgICAgICBUaWxl ZEJhY2tpbmdTdG9yZUVuYWJsZWQsCiAgICAgICAgIEZyYW1lRmxhdHRlbmluZ0VuYWJsZWQsCiAg ICAgICAgIFNpdGVTcGVjaWZpY1F1aXJrc0VuYWJsZWQsCi0gICAgICAgIFdlYkdMRW5hYmxlZAor ICAgICAgICBXZWJHTEVuYWJsZWQsCisgICAgICAgIEFsbG93U2NyaXB0c1RvQ2xvc2VXaW5kb3dz CiAgICAgfTsKICAgICBlbnVtIFdlYkdyYXBoaWMgewogICAgICAgICBNaXNzaW5nSW1hZ2VHcmFw aGljLAo= 70868 2010-10-15 08:33:19 -0700 2010-10-15 08:48:38 -0700 patch3 bug46186_3.patch text/plain 2683 qi.2.zhang SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjk4NTMpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMTAtMTUgIFFpIFpoYW5nICA8cWkuMi56aGFuZ0Bu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XSB3aW5kb3cuY2xvc2UoKSBkb2Vzbid0IHdvcmsgaW4gcXQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTg2CisKKyAgICAgICAgSW50cm9k dWNlIG5ldyBhdHRyaWJ1dGUgaW4gUVdlYlNldHRpbmdzIHRvIHRyaWdnZXIgInNldEFsbG93U2Ny aXB0c1RvQ2xvc2VXaW5kb3ciCisKKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAg ICAgICAgKFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KToKKyAgICAgICAgKiBBcGkvcXdlYnNl dHRpbmdzLmg6CisKIDIwMTAtMTAtMTUgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRl eDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9x dC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24gNjk4NTApCisrKyBXZWJLaXQvcXQvQXBp L3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4NCw2ICsxODQsMTAgQEAgdm9p ZCBRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSgpCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdsb2JhbC0+YXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6OkphdmFz Y3JpcHRDYW5PcGVuV2luZG93cykpOwogICAgICAgICBzZXR0aW5ncy0+c2V0SmF2YVNjcmlwdENh bk9wZW5XaW5kb3dzQXV0b21hdGljYWxseSh2YWx1ZSk7CiAKKyAgICAgICAgdmFsdWUgPSBhdHRy aWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6SmF2YXNjcmlwdENhbkNsb3NlV2luZG93cywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2xvYmFsLT5hdHRyaWJ1dGVzLnZh bHVlKFFXZWJTZXR0aW5nczo6SmF2YXNjcmlwdENhbkNsb3NlV2luZG93cykpOworICAgICAgICBz ZXR0aW5ncy0+c2V0QWxsb3dTY3JpcHRzVG9DbG9zZVdpbmRvd3ModmFsdWUpOworCiAgICAgICAg IHZhbHVlID0gYXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6OkphdmFFbmFibGVkLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFs dWUoUVdlYlNldHRpbmdzOjpKYXZhRW5hYmxlZCkpOwogICAgICAgICBzZXR0aW5ncy0+c2V0SmF2 YUVuYWJsZWQodmFsdWUpOwpAQCAtMzg5LDYgKzM5Myw4IEBAIFFXZWJTZXR0aW5ncyogUVdlYlNl dHRpbmdzOjpnbG9iYWxTZXR0aW4KICAgICAgICAgcmVjb3JkaW5nIHZpc2l0ZWQgcGFnZXMgaW4g dGhlIGhpc3RvcnkgYW5kIHN0b3Jpbmcgd2ViIHBhZ2UgaWNvbnMuIFRoaXMgaXMgZGlzYWJsZWQg YnkgZGVmYXVsdC4KICAgICBcdmFsdWUgSmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzIFNwZWNpZmll cyB3aGV0aGVyIEphdmFTY3JpcHQgcHJvZ3JhbXMKICAgICAgICAgY2FuIG9wZW4gbmV3IHdpbmRv d3MuIFRoaXMgaXMgZGlzYWJsZWQgYnkgZGVmYXVsdC4KKyAgICBcdmFsdWUgSmF2YXNjcmlwdENh bkNsb3NlV2luZG93cyBTcGVjaWZpZXMgd2hldGhlciBKYXZhU2NyaXB0IHByb2dyYW1zCisgICAg ICAgIGNhbiBjbG9zZSB3aW5kb3dzLiBUaGlzIGlzIGRpc2FibGVkIGJ5IGRlZmF1bHQuCiAgICAg XHZhbHVlIEphdmFzY3JpcHRDYW5BY2Nlc3NDbGlwYm9hcmQgU3BlY2lmaWVzIHdoZXRoZXIgSmF2 YVNjcmlwdCBwcm9ncmFtcwogICAgICAgICBjYW4gcmVhZCBvciB3cml0ZSB0byB0aGUgY2xpcGJv YXJkLiBUaGlzIGlzIGRpc2FibGVkIGJ5IGRlZmF1bHQuCiAgICAgXHZhbHVlIERldmVsb3BlckV4 dHJhc0VuYWJsZWQgRW5hYmxlcyBleHRyYSB0b29scyBmb3IgV2ViIGRldmVsb3BlcnMuCkluZGV4 OiBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9B cGkvcXdlYnNldHRpbmdzLmgJKHJldmlzaW9uIDY5ODUwKQorKysgV2ViS2l0L3F0L0FwaS9xd2Vi c2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNiArNTUsNyBAQCBwdWJsaWM6CiAgICAg ICAgIFBsdWdpbnNFbmFibGVkLAogICAgICAgICBQcml2YXRlQnJvd3NpbmdFbmFibGVkLAogICAg ICAgICBKYXZhc2NyaXB0Q2FuT3BlbldpbmRvd3MsCisgICAgICAgIEphdmFzY3JpcHRDYW5DbG9z ZVdpbmRvd3MsCiAgICAgICAgIEphdmFzY3JpcHRDYW5BY2Nlc3NDbGlwYm9hcmQsCiAgICAgICAg IERldmVsb3BlckV4dHJhc0VuYWJsZWQsCiAgICAgICAgIExpbmtzSW5jbHVkZWRJbkZvY3VzQ2hh aW4sCg== 70870 2010-10-15 08:48:38 -0700 2010-10-15 09:27:36 -0700 patch4 bug46186_4.patch text/plain 2703 qi.2.zhang SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNjk4NTMpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMTAtMTUgIFFpIFpoYW5nICA8cWkuMi56aGFuZ0Bu b2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW1F0XSB3aW5kb3cuY2xvc2UoKSBkb2Vzbid0IHdvcmsgaW4gcXQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2MTg2CisKKyAgICAgICAgSW50cm9k dWNlIG5ldyBhdHRyaWJ1dGUgaW4gUVdlYlNldHRpbmdzIHRvIHRyaWdnZXIgInNldEFsbG93U2Ny aXB0c1RvQ2xvc2VXaW5kb3ciCisKKyAgICAgICAgKiBBcGkvcXdlYnNldHRpbmdzLmNwcDoKKyAg ICAgICAgKFFXZWJTZXR0aW5nc1ByaXZhdGU6OmFwcGx5KToKKyAgICAgICAgKiBBcGkvcXdlYnNl dHRpbmdzLmg6CisKIDIwMTAtMTAtMTUgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRl eDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9x dC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24gNjk4NTApCisrKyBXZWJLaXQvcXQvQXBp L3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4NCw2ICsxODQsMTAgQEAgdm9p ZCBRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSgpCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdsb2JhbC0+YXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6OkphdmFz Y3JpcHRDYW5PcGVuV2luZG93cykpOwogICAgICAgICBzZXR0aW5ncy0+c2V0SmF2YVNjcmlwdENh bk9wZW5XaW5kb3dzQXV0b21hdGljYWxseSh2YWx1ZSk7CiAKKyAgICAgICAgdmFsdWUgPSBhdHRy aWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6SmF2YXNjcmlwdENhbkNsb3NlV2luZG93cywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2xvYmFsLT5hdHRyaWJ1dGVzLnZh bHVlKFFXZWJTZXR0aW5nczo6SmF2YXNjcmlwdENhbkNsb3NlV2luZG93cykpOworICAgICAgICBz ZXR0aW5ncy0+c2V0QWxsb3dTY3JpcHRzVG9DbG9zZVdpbmRvd3ModmFsdWUpOworCiAgICAgICAg IHZhbHVlID0gYXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6OkphdmFFbmFibGVkLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnbG9iYWwtPmF0dHJpYnV0ZXMudmFs dWUoUVdlYlNldHRpbmdzOjpKYXZhRW5hYmxlZCkpOwogICAgICAgICBzZXR0aW5ncy0+c2V0SmF2 YUVuYWJsZWQodmFsdWUpOwpAQCAtMzg5LDYgKzM5Myw4IEBAIFFXZWJTZXR0aW5ncyogUVdlYlNl dHRpbmdzOjpnbG9iYWxTZXR0aW4KICAgICAgICAgcmVjb3JkaW5nIHZpc2l0ZWQgcGFnZXMgaW4g dGhlIGhpc3RvcnkgYW5kIHN0b3Jpbmcgd2ViIHBhZ2UgaWNvbnMuIFRoaXMgaXMgZGlzYWJsZWQg YnkgZGVmYXVsdC4KICAgICBcdmFsdWUgSmF2YXNjcmlwdENhbk9wZW5XaW5kb3dzIFNwZWNpZmll cyB3aGV0aGVyIEphdmFTY3JpcHQgcHJvZ3JhbXMKICAgICAgICAgY2FuIG9wZW4gbmV3IHdpbmRv d3MuIFRoaXMgaXMgZGlzYWJsZWQgYnkgZGVmYXVsdC4KKyAgICBcdmFsdWUgSmF2YXNjcmlwdENh bkNsb3NlV2luZG93cyBTcGVjaWZpZXMgd2hldGhlciBKYXZhU2NyaXB0IHByb2dyYW1zCisgICAg ICAgIGNhbiBjbG9zZSB3aW5kb3dzLiBUaGlzIGlzIGRpc2FibGVkIGJ5IGRlZmF1bHQuCiAgICAg XHZhbHVlIEphdmFzY3JpcHRDYW5BY2Nlc3NDbGlwYm9hcmQgU3BlY2lmaWVzIHdoZXRoZXIgSmF2 YVNjcmlwdCBwcm9ncmFtcwogICAgICAgICBjYW4gcmVhZCBvciB3cml0ZSB0byB0aGUgY2xpcGJv YXJkLiBUaGlzIGlzIGRpc2FibGVkIGJ5IGRlZmF1bHQuCiAgICAgXHZhbHVlIERldmVsb3BlckV4 dHJhc0VuYWJsZWQgRW5hYmxlcyBleHRyYSB0b29scyBmb3IgV2ViIGRldmVsb3BlcnMuCkluZGV4 OiBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9B cGkvcXdlYnNldHRpbmdzLmgJKHJldmlzaW9uIDY5ODUwKQorKysgV2ViS2l0L3F0L0FwaS9xd2Vi c2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtNzYsNyArNzYsOCBAQCBwdWJsaWM6CiAgICAg ICAgIEZyYW1lRmxhdHRlbmluZ0VuYWJsZWQsCiAgICAgICAgIFNpdGVTcGVjaWZpY1F1aXJrc0Vu YWJsZWQsCiAgICAgICAgIFdlYkdMRW5hYmxlZCwKLSAgICAgICAgSHlwZXJsaW5rQXVkaXRpbmdF bmFibGVkCisgICAgICAgIEh5cGVybGlua0F1ZGl0aW5nRW5hYmxlZCwKKyAgICAgICAgSmF2YXNj cmlwdENhbkNsb3NlV2luZG93cwogICAgIH07CiAgICAgZW51bSBXZWJHcmFwaGljIHsKICAgICAg ICAgTWlzc2luZ0ltYWdlR3JhcGhpYywK