111979 2013-03-11 05:44:51 -0700 [Qt] Qml WebKit needs preferences to change security knobs 2013-03-25 06:56:45 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED P3 Normal --- 0 ermilov.maxim webkit-unassigned abecsi allan.jensen benjamin cmarcelo hausmann jturcotte kenneth menard michael.bruning webkit.review.bot oldest_to_newest 852219 0 ermilov.maxim 2013-03-11 05:44:51 -0700 Qml WebKit needs preferences to change security knobs 852223 1 192450 ermilov.maxim 2013-03-11 05:50:48 -0700 Created attachment 192450 Patch 859437 2 michael.bruning 2013-03-20 08:17:42 -0700 Looks good to me. 859446 3 jturcotte 2013-03-20 08:26:34 -0700 LGTM This needs a WebKit2 Owner approval before this can go on. CCing Benjamin hoping he's not too busy :) 859447 4 jturcotte 2013-03-20 08:26:59 -0700 CCing Benjamin for real this time. 859726 5 192450 benjamin 2013-03-20 14:17:43 -0700 Comment on attachment 192450 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192450&action=review Why do you need to expose WebSecurityEnabled? I am not too worried about the two others but a word of explanation for those would be nice. > Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp:594 > + d->setAttribute(QWebPreferencesPrivate::UniversalAccessFromFileURLsAllowed, enable); > + emit universalAccessFromFileURLsAllowedChanged(); You don't check the original value before emitting the signal? > Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp:605 > + d->setAttribute(QWebPreferencesPrivate::FileAccessFromFileURLsAllowed, enable); > + emit fileAccessFromFileURLsAllowedChanged(); Ditto. > Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp:616 > + d->setAttribute(QWebPreferencesPrivate::WebSecurityEnabled, enable); > + emit webSecurityEnabledChanged(); Ditto. 861564 6 194568 ermilov.maxim 2013-03-22 09:29:12 -0700 Created attachment 194568 Patch 861569 7 ermilov.maxim 2013-03-22 09:32:18 -0700 > Why do you need to expose WebSecurityEnabled? I need 2 others, WebSecurityEnabled was added just in case of future needs. (expose only UniversalAccessFromFileURLsAllowed/FileAccessFromFileURLsAllowed in patch) > You don't check the original value before emitting the signal? fixed 861883 8 194568 benjamin 2013-03-22 15:08:13 -0700 Comment on attachment 194568 Patch Signed off by me for WebKit2. 862679 9 194568 jturcotte 2013-03-25 05:59:30 -0700 Comment on attachment 194568 Patch (In reply to comment #8) > (From update of attachment 194568 [details]) > Signed off by me for WebKit2. r=me (with special thanks to Benjamin for covering my slopiness) 862717 10 194568 webkit.review.bot 2013-03-25 06:56:40 -0700 Comment on attachment 194568 Patch Clearing flags on attachment: 194568 Committed r146766: <http://trac.webkit.org/changeset/146766> 862718 11 webkit.review.bot 2013-03-25 06:56:45 -0700 All reviewed patches have been landed. Closing bug. 192450 2013-03-11 05:50:48 -0700 2013-03-22 09:29:06 -0700 Patch bug-111979-20130311164650.patch text/plain 7332 ermilov.maxim U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOTcyYWMzNjAzYzMzMTVm NmExMjc4YzNkZDNhZDZjMzEzNWM1YjNhYS4uNTBiNzQ0NGMxOTZkYWZlYzI5MWZmM2YzYTcxZTY5 ZmZkMjJlZjhkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAzLTExICBNYXhp bSBFcm1pbG92ICA8bWF4aW0uZXJtaWxvdkBjYW5vbmljYWwuY29tPgorCisgICAgICAgIFtRdF0g UW1sIFdlYktpdCBuZWVkcyBwcmVmZXJlbmNlcyB0byBjaGFuZ2Ugc2VjdXJpdHkga25vYnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTk3OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9xdC9xd2VicHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoUVdlYlByZWZlcmVuY2VzUHJp dmF0ZTo6dGVzdEF0dHJpYnV0ZSk6CisgICAgICAgIChRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpz ZXRBdHRyaWJ1dGUpOgorICAgICAgICAoUVdlYlByZWZlcmVuY2VzOjp1bml2ZXJzYWxBY2Nlc3NG cm9tRmlsZVVSTHNBbGxvd2VkKToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNlczo6c2V0VW5pdmVy c2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZCk6CisgICAgICAgIChRV2ViUHJlZmVyZW5jZXM6 OmZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkKToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNl czo6c2V0RmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQpOgorICAgICAgICAoUVdlYlByZWZl cmVuY2VzOjp3ZWJTZWN1cml0eUVuYWJsZWQpOgorICAgICAgICAoUVdlYlByZWZlcmVuY2VzOjpz ZXRXZWJTZWN1cml0eUVuYWJsZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdlYnBy ZWZlcmVuY2VzX3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNl c19wX3AuaDoKKwogMjAxMy0wMy0wOSAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29AaWdh bGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXSzJdIEZpeCBjb21waWxhdGlvbiB3YXJuaW5nIG1p c3NpbmctZmllbGQtaW5pdGlhbGl6ZXJzIGluIHdlYmtpdC0yLjAgc3RhYmxlIGJyYW5jaApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXMu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXMuY3Bw CmluZGV4IDZkMmNhYzEwMWQ5MjYwMjU4NzBlNjlkMjZmM2Q2MTI5ZThhYzA4MjEuLjlhOTg3MDQ1 NDU5OGI4MmVmOThlMmE3YTIzZTRmNjZiN2JiMmQxZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlcy5jcHAKQEAgLTc5LDYgKzc5LDEy IEBAIGJvb2wgUVdlYlByZWZlcmVuY2VzUHJpdmF0ZTo6dGVzdEF0dHJpYnV0ZShRV2ViUHJlZmVy ZW5jZXNQcml2YXRlOjpXZWJBdHRyaWJ1dGUKICAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNH ZXRDYXJldEJyb3dzaW5nRW5hYmxlZChwcmVmZXJlbmNlc1JlZik7CiAgICAgY2FzZSBOb3RpZmlj YXRpb25zRW5hYmxlZDoKICAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXROb3RpZmljYXRp b25zRW5hYmxlZChwcmVmZXJlbmNlc1JlZik7CisgICAgY2FzZSBVbml2ZXJzYWxBY2Nlc3NGcm9t RmlsZVVSTHNBbGxvd2VkOgorICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldFVuaXZlcnNh bEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQocHJlZmVyZW5jZXNSZWYpOworICAgIGNhc2UgRmls ZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQ6CisgICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2Vz R2V0RmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQocHJlZmVyZW5jZXNSZWYpOworICAgIGNh c2UgV2ViU2VjdXJpdHlFbmFibGVkOgorICAgICAgICByZXR1cm4gV0tQcmVmZXJlbmNlc0dldFdl YlNlY3VyaXR5RW5hYmxlZChwcmVmZXJlbmNlc1JlZik7CiAgICAgZGVmYXVsdDoKICAgICAgICAg QVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTE0NSw2ICsx NTEsMTUgQEAgdm9pZCBRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpzZXRBdHRyaWJ1dGUoUVdlYlBy ZWZlcmVuY2VzUHJpdmF0ZTo6V2ViQXR0cmlidXRlIGEKICAgICBjYXNlIE5vdGlmaWNhdGlvbnNF bmFibGVkOgogICAgICAgICBXS1ByZWZlcmVuY2VzU2V0Tm90aWZpY2F0aW9uc0VuYWJsZWQocHJl ZmVyZW5jZXNSZWYsIGVuYWJsZSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgVW5pdmVyc2Fs QWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZDoKKyAgICAgICAgV0tQcmVmZXJlbmNlc1NldFVuaXZl cnNhbEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQocHJlZmVyZW5jZXNSZWYsIGVuYWJsZSk7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgRmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQ6Cisg ICAgICAgIFdLUHJlZmVyZW5jZXNTZXRGaWxlQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZChwcmVm ZXJlbmNlc1JlZiwgZW5hYmxlKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBXZWJTZWN1cml0 eUVuYWJsZWQ6CisgICAgICAgIFdLUHJlZmVyZW5jZXNTZXRXZWJTZWN1cml0eUVuYWJsZWQocHJl ZmVyZW5jZXNSZWYsIGVuYWJsZSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KQEAgLTU2OCw2ICs1ODMsMzkgQEAgdm9p ZCBRV2ViUHJlZmVyZW5jZXM6OnNldE5vdGlmaWNhdGlvbnNFbmFibGVkKGJvb2wgZW5hYmxlKQog ICAgIGVtaXQgbm90aWZpY2F0aW9uc0VuYWJsZWRDaGFuZ2VkKCk7CiB9CiAKK2Jvb2wgUVdlYlBy ZWZlcmVuY2VzOjp1bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkKCkgY29uc3QKK3sK KyAgICByZXR1cm4gZC0+dGVzdEF0dHJpYnV0ZShRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpVbml2 ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkKTsKK30KKwordm9pZCBRV2ViUHJlZmVyZW5j ZXM6OnNldFVuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQoYm9vbCBlbmFibGUpCit7 CisgICAgZC0+c2V0QXR0cmlidXRlKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OlVuaXZlcnNhbEFj Y2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQsIGVuYWJsZSk7CisgICAgZW1pdCB1bml2ZXJzYWxBY2Nl c3NGcm9tRmlsZVVSTHNBbGxvd2VkQ2hhbmdlZCgpOworfQorCitib29sIFFXZWJQcmVmZXJlbmNl czo6ZmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQoKSBjb25zdAoreworICAgIHJldHVybiBk LT50ZXN0QXR0cmlidXRlKFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OkZpbGVBY2Nlc3NGcm9tRmls ZVVSTHNBbGxvd2VkKTsKK30KKwordm9pZCBRV2ViUHJlZmVyZW5jZXM6OnNldEZpbGVBY2Nlc3NG cm9tRmlsZVVSTHNBbGxvd2VkKGJvb2wgZW5hYmxlKQoreworICAgIGQtPnNldEF0dHJpYnV0ZShR V2ViUHJlZmVyZW5jZXNQcml2YXRlOjpGaWxlQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZCwgZW5h YmxlKTsKKyAgICBlbWl0IGZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkQ2hhbmdlZCgpOwor fQorCitib29sIFFXZWJQcmVmZXJlbmNlczo6d2ViU2VjdXJpdHlFbmFibGVkKCkgY29uc3QKK3sK KyAgICByZXR1cm4gZC0+dGVzdEF0dHJpYnV0ZShRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpXZWJT ZWN1cml0eUVuYWJsZWQpOworfQorCit2b2lkIFFXZWJQcmVmZXJlbmNlczo6c2V0V2ViU2VjdXJp dHlFbmFibGVkKGJvb2wgZW5hYmxlKQoreworICAgIGQtPnNldEF0dHJpYnV0ZShRV2ViUHJlZmVy ZW5jZXNQcml2YXRlOjpXZWJTZWN1cml0eUVuYWJsZWQsIGVuYWJsZSk7CisgICAgZW1pdCB3ZWJT ZWN1cml0eUVuYWJsZWRDaGFuZ2VkKCk7Cit9CisKIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGUqIFFX ZWJQcmVmZXJlbmNlc1ByaXZhdGU6OmdldChRV2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKQog ewogICAgIHJldHVybiBwcmVmZXJlbmNlcy0+ZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3AuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3AuaAppbmRleCA3ZmM1MjIwNDJkOWM3ZTVh MTg5NjBmYmI1MGFjMTQ1ZGUyM2JiYWQ1Li4wNDQwMWFmMDk0ZjkwZmFkZjFmNGU4ZjlkNmY1Nzk4 MzllMmM1MThhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3 ZWJwcmVmZXJlbmNlc19wLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2VicHJlZmVyZW5jZXNfcC5oCkBAIC00Nyw2ICs0Nyw5IEBAIHB1YmxpYzoKICAgICBRX1BST1BF UlRZKGJvb2wgd2ViQXVkaW9FbmFibGVkIFJFQUQgd2ViQXVkaW9FbmFibGVkIFdSSVRFIHNldFdl YkF1ZGlvRW5hYmxlZCBOT1RJRlkgd2ViQXVkaW9FbmFibGVkQ2hhbmdlZCBGSU5BTCkKICAgICBR X1BST1BFUlRZKGJvb2wgY2FyZXRCcm93c2luZ0VuYWJsZWQgUkVBRCBjYXJldEJyb3dzaW5nRW5h YmxlZCBXUklURSBzZXRDYXJldEJyb3dzaW5nRW5hYmxlZCBOT1RJRlkgY2FyZXRCcm93c2luZ0Vu YWJsZWRDaGFuZ2VkIEZJTkFMKQogICAgIFFfUFJPUEVSVFkoYm9vbCBub3RpZmljYXRpb25zRW5h YmxlZCBSRUFEIG5vdGlmaWNhdGlvbnNFbmFibGVkIFdSSVRFIHNldE5vdGlmaWNhdGlvbnNFbmFi bGVkIE5PVElGWSBub3RpZmljYXRpb25zRW5hYmxlZENoYW5nZWQgRklOQUwpCisgICAgUV9QUk9Q RVJUWShib29sIHVuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQgUkVBRCB1bml2ZXJz YWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkIFdSSVRFIHNldFVuaXZlcnNhbEFjY2Vzc0Zyb21G aWxlVVJMc0FsbG93ZWQgTk9USUZZIHVuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWRD aGFuZ2VkIEZJTkFMKQorICAgIFFfUFJPUEVSVFkoYm9vbCBmaWxlQWNjZXNzRnJvbUZpbGVVUkxz QWxsb3dlZCBSRUFEIGZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkIFdSSVRFIHNldEZpbGVB Y2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkIE5PVElGWSBmaWxlQWNjZXNzRnJvbUZpbGVVUkxzQWxs b3dlZENoYW5nZWQgRklOQUwpCisgICAgUV9QUk9QRVJUWShib29sIHdlYlNlY3VyaXR5RW5hYmxl ZCBSRUFEIHdlYlNlY3VyaXR5RW5hYmxlZCBXUklURSBzZXRXZWJTZWN1cml0eUVuYWJsZWQgTk9U SUZZIHdlYlNlY3VyaXR5RW5hYmxlZENoYW5nZWQgRklOQUwpCiAKICAgICBRX1BST1BFUlRZKFFT dHJpbmcgc3RhbmRhcmRGb250RmFtaWx5IFJFQUQgc3RhbmRhcmRGb250RmFtaWx5IFdSSVRFIHNl dFN0YW5kYXJkRm9udEZhbWlseSBOT1RJRlkgc3RhbmRhcmRGb250RmFtaWx5Q2hhbmdlZCBGSU5B TCkKICAgICBRX1BST1BFUlRZKFFTdHJpbmcgZml4ZWRGb250RmFtaWx5IFJFQUQgZml4ZWRGb250 RmFtaWx5IFdSSVRFIHNldEZpeGVkRm9udEZhbWlseSBOT1RJRlkgZml4ZWRGb250RmFtaWx5Q2hh bmdlZCBGSU5BTCkKQEAgLTEwNyw2ICsxMTAsMTUgQEAgcHVibGljOgogICAgIGJvb2wgbm90aWZp Y2F0aW9uc0VuYWJsZWQoKSBjb25zdDsKICAgICB2b2lkIHNldE5vdGlmaWNhdGlvbnNFbmFibGVk KGJvb2wgZW5hYmxlKTsKIAorICAgIGJvb2wgdW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxs b3dlZCgpIGNvbnN0OworICAgIHZvaWQgc2V0VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxs b3dlZChib29sIGVuYWJsZSk7CisKKyAgICBib29sIGZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxv d2VkKCkgY29uc3Q7CisgICAgdm9pZCBzZXRGaWxlQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZChi b29sIGVuYWJsZSk7CisKKyAgICBib29sIHdlYlNlY3VyaXR5RW5hYmxlZCgpIGNvbnN0OworICAg IHZvaWQgc2V0V2ViU2VjdXJpdHlFbmFibGVkKGJvb2wgZW5hYmxlKTsKKwogICAgIFFTdHJpbmcg c3RhbmRhcmRGb250RmFtaWx5KCkgY29uc3Q7CiAgICAgdm9pZCBzZXRTdGFuZGFyZEZvbnRGYW1p bHkoY29uc3QgUVN0cmluZyYgZmFtaWx5KTsKIApAQCAtMTUxLDYgKzE2Myw5IEBAIFFfU0lHTkFM UzoKICAgICB2b2lkIHdlYkF1ZGlvRW5hYmxlZENoYW5nZWQoKTsKICAgICB2b2lkIGNhcmV0QnJv d3NpbmdFbmFibGVkQ2hhbmdlZCgpOwogICAgIHZvaWQgbm90aWZpY2F0aW9uc0VuYWJsZWRDaGFu Z2VkKCk7CisgICAgdm9pZCB1bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkQ2hhbmdl ZCgpOworICAgIHZvaWQgZmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWRDaGFuZ2VkKCk7Cisg ICAgdm9pZCB3ZWJTZWN1cml0eUVuYWJsZWRDaGFuZ2VkKCk7CiAKICAgICB2b2lkIHN0YW5kYXJk Rm9udEZhbWlseUNoYW5nZWQoKTsKICAgICB2b2lkIGZpeGVkRm9udEZhbWlseUNoYW5nZWQoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVu Y2VzX3BfcC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5j ZXNfcF9wLmgKaW5kZXggNmVlNjkyYzMwYmNmYTU0YmVkNmJhYTg2OTM5ZmI2NDIzNTZkZWM0Yi4u OTQ1MTY1MWY1NDU3OGRkYWU4YTc4YzJiZjVmZWFmOTVmYWUwZTBlNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXNfcF9wLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXNfcF9wLmgKQEAg LTQxLDcgKzQxLDEwIEBAIHB1YmxpYzoKICAgICAgICAgQ1NTQ3VzdG9tRmlsdGVyRW5hYmxlZCwK ICAgICAgICAgV2ViQXVkaW9FbmFibGVkLAogICAgICAgICBDYXJldEJyb3dzaW5nRW5hYmxlZCwK LSAgICAgICAgTm90aWZpY2F0aW9uc0VuYWJsZWQKKyAgICAgICAgTm90aWZpY2F0aW9uc0VuYWJs ZWQsCisgICAgICAgIFVuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQsCisgICAgICAg IEZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkLAorICAgICAgICBXZWJTZWN1cml0eUVuYWJs ZWQKICAgICB9OwogCiAgICAgZW51bSBGb250RmFtaWx5IHsK 194568 2013-03-22 09:29:12 -0700 2013-03-25 06:56:40 -0700 Patch bug-111979-20130322202502.patch text/plain 6554 ermilov.maxim U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2NjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYWFjYjIyMjI1YzhlZDA0 Y2ZjZWY2OTYxZTEyMzBkODUzNTQ2MDdkZC4uYWVhY2U4YmY4MGI0ODMxY2M2MzAwNDgxNjI0ODI1 NGZiOTZiOTI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAzLTIyICBNYXhp bSBFcm1pbG92ICA8bWF4aW0uZXJtaWxvdkBjYW5vbmljYWwuY29tPgorCisgICAgICAgIFtRdF0g UW1sIFdlYktpdCBuZWVkcyBwcmVmZXJlbmNlcyB0byBjaGFuZ2Ugc2VjdXJpdHkga25vYnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTk3OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9xdC9xd2VicHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoUVdlYlByZWZlcmVuY2VzUHJp dmF0ZTo6dGVzdEF0dHJpYnV0ZSk6CisgICAgICAgIChRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpz ZXRBdHRyaWJ1dGUpOgorICAgICAgICAoUVdlYlByZWZlcmVuY2VzOjp1bml2ZXJzYWxBY2Nlc3NG cm9tRmlsZVVSTHNBbGxvd2VkKToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNlczo6c2V0VW5pdmVy c2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZCk6CisgICAgICAgIChRV2ViUHJlZmVyZW5jZXM6 OmZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkKToKKyAgICAgICAgKFFXZWJQcmVmZXJlbmNl czo6c2V0RmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3AuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0 L3F3ZWJwcmVmZXJlbmNlc19wX3AuaDoKKwogMjAxMy0wMy0yMSAgVGltIEhvcnRvbiAgPHRpbW90 aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2syXSBQYWdlIE92ZXJsYXlzOiBEb24n dCBjcmVhdGUgYmFja2luZyBzdG9yZSB1bnRpbCB0aGUgY2xpZW50IGFza3MgdXMgdG8gcGFpbnQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVu Y2VzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2Vz LmNwcAppbmRleCA2ZDJjYWMxMDFkOTI2MDI1ODcwZTY5ZDI2ZjNkNjEyOWU4YWMwODIxLi4yNmVi OTQ0ZTkwZjc4YzQyY2E1ZDI2OWZhOTUyYjc2OTViNmE1NzkxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXMuY3BwCkBAIC03OSw2ICs3 OSwxMCBAQCBib29sIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OnRlc3RBdHRyaWJ1dGUoUVdlYlBy ZWZlcmVuY2VzUHJpdmF0ZTo6V2ViQXR0cmlidXRlCiAgICAgICAgIHJldHVybiBXS1ByZWZlcmVu Y2VzR2V0Q2FyZXRCcm93c2luZ0VuYWJsZWQocHJlZmVyZW5jZXNSZWYpOwogICAgIGNhc2UgTm90 aWZpY2F0aW9uc0VuYWJsZWQ6CiAgICAgICAgIHJldHVybiBXS1ByZWZlcmVuY2VzR2V0Tm90aWZp Y2F0aW9uc0VuYWJsZWQocHJlZmVyZW5jZXNSZWYpOworICAgIGNhc2UgVW5pdmVyc2FsQWNjZXNz RnJvbUZpbGVVUkxzQWxsb3dlZDoKKyAgICAgICAgcmV0dXJuIFdLUHJlZmVyZW5jZXNHZXRVbml2 ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkKHByZWZlcmVuY2VzUmVmKTsKKyAgICBjYXNl IEZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkOgorICAgICAgICByZXR1cm4gV0tQcmVmZXJl bmNlc0dldEZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkKHByZWZlcmVuY2VzUmVmKTsKICAg ICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJu IGZhbHNlOwpAQCAtMTQ1LDYgKzE0OSwxMiBAQCB2b2lkIFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6 OnNldEF0dHJpYnV0ZShRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpXZWJBdHRyaWJ1dGUgYQogICAg IGNhc2UgTm90aWZpY2F0aW9uc0VuYWJsZWQ6CiAgICAgICAgIFdLUHJlZmVyZW5jZXNTZXROb3Rp ZmljYXRpb25zRW5hYmxlZChwcmVmZXJlbmNlc1JlZiwgZW5hYmxlKTsKICAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkOgorICAgICAgICBX S1ByZWZlcmVuY2VzU2V0VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZChwcmVmZXJl bmNlc1JlZiwgZW5hYmxlKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBGaWxlQWNjZXNzRnJv bUZpbGVVUkxzQWxsb3dlZDoKKyAgICAgICAgV0tQcmVmZXJlbmNlc1NldEZpbGVBY2Nlc3NGcm9t RmlsZVVSTHNBbGxvd2VkKHByZWZlcmVuY2VzUmVmLCBlbmFibGUpOworICAgICAgICBicmVhazsK ICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CkBAIC01 NjgsNiArNTc4LDMyIEBAIHZvaWQgUVdlYlByZWZlcmVuY2VzOjpzZXROb3RpZmljYXRpb25zRW5h YmxlZChib29sIGVuYWJsZSkKICAgICBlbWl0IG5vdGlmaWNhdGlvbnNFbmFibGVkQ2hhbmdlZCgp OwogfQogCitib29sIFFXZWJQcmVmZXJlbmNlczo6dW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxz QWxsb3dlZCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGQtPnRlc3RBdHRyaWJ1dGUoUVdlYlByZWZl cmVuY2VzUHJpdmF0ZTo6VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZCk7Cit9CisK K3ZvaWQgUVdlYlByZWZlcmVuY2VzOjpzZXRVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxv d2VkKGJvb2wgZW5hYmxlKQoreworICAgIGlmICh1bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNB bGxvd2VkKCkgPT0gZW5hYmxlKQorICAgICAgICByZXR1cm47CisgICAgZC0+c2V0QXR0cmlidXRl KFFXZWJQcmVmZXJlbmNlc1ByaXZhdGU6OlVuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93 ZWQsIGVuYWJsZSk7CisgICAgZW1pdCB1bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2Vk Q2hhbmdlZCgpOworfQorCitib29sIFFXZWJQcmVmZXJlbmNlczo6ZmlsZUFjY2Vzc0Zyb21GaWxl VVJMc0FsbG93ZWQoKSBjb25zdAoreworICAgIHJldHVybiBkLT50ZXN0QXR0cmlidXRlKFFXZWJQ cmVmZXJlbmNlc1ByaXZhdGU6OkZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkKTsKK30KKwor dm9pZCBRV2ViUHJlZmVyZW5jZXM6OnNldEZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkKGJv b2wgZW5hYmxlKQoreworICAgIGlmIChmaWxlQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZCgpID09 IGVuYWJsZSkKKyAgICAgICAgcmV0dXJuOworICAgIGQtPnNldEF0dHJpYnV0ZShRV2ViUHJlZmVy ZW5jZXNQcml2YXRlOjpGaWxlQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZCwgZW5hYmxlKTsKKyAg ICBlbWl0IGZpbGVBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkQ2hhbmdlZCgpOworfQorCiBRV2Vi UHJlZmVyZW5jZXNQcml2YXRlKiBRV2ViUHJlZmVyZW5jZXNQcml2YXRlOjpnZXQoUVdlYlByZWZl cmVuY2VzKiBwcmVmZXJlbmNlcykKIHsKICAgICByZXR1cm4gcHJlZmVyZW5jZXMtPmQ7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlc19w LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlc19wLmgK aW5kZXggN2ZjNTIyMDQyZDljN2U1YTE4OTYwZmJiNTBhYzE0NWRlMjNiYmFkNS4uOWM1MDNkNDMx MzY3NGI3MDM2ODA0NDJiYTU2ZTA5NGY3ODhlZjFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXNfcC5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdlYnByZWZlcmVuY2VzX3AuaApAQCAtNDcsNiArNDcsOCBA QCBwdWJsaWM6CiAgICAgUV9QUk9QRVJUWShib29sIHdlYkF1ZGlvRW5hYmxlZCBSRUFEIHdlYkF1 ZGlvRW5hYmxlZCBXUklURSBzZXRXZWJBdWRpb0VuYWJsZWQgTk9USUZZIHdlYkF1ZGlvRW5hYmxl ZENoYW5nZWQgRklOQUwpCiAgICAgUV9QUk9QRVJUWShib29sIGNhcmV0QnJvd3NpbmdFbmFibGVk IFJFQUQgY2FyZXRCcm93c2luZ0VuYWJsZWQgV1JJVEUgc2V0Q2FyZXRCcm93c2luZ0VuYWJsZWQg Tk9USUZZIGNhcmV0QnJvd3NpbmdFbmFibGVkQ2hhbmdlZCBGSU5BTCkKICAgICBRX1BST1BFUlRZ KGJvb2wgbm90aWZpY2F0aW9uc0VuYWJsZWQgUkVBRCBub3RpZmljYXRpb25zRW5hYmxlZCBXUklU RSBzZXROb3RpZmljYXRpb25zRW5hYmxlZCBOT1RJRlkgbm90aWZpY2F0aW9uc0VuYWJsZWRDaGFu Z2VkIEZJTkFMKQorICAgIFFfUFJPUEVSVFkoYm9vbCB1bml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVS THNBbGxvd2VkIFJFQUQgdW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZCBXUklURSBz ZXRVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkIE5PVElGWSB1bml2ZXJzYWxBY2Nl c3NGcm9tRmlsZVVSTHNBbGxvd2VkQ2hhbmdlZCBGSU5BTCkKKyAgICBRX1BST1BFUlRZKGJvb2wg ZmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWQgUkVBRCBmaWxlQWNjZXNzRnJvbUZpbGVVUkxz QWxsb3dlZCBXUklURSBzZXRGaWxlQWNjZXNzRnJvbUZpbGVVUkxzQWxsb3dlZCBOT1RJRlkgZmls ZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWRDaGFuZ2VkIEZJTkFMKQogCiAgICAgUV9QUk9QRVJU WShRU3RyaW5nIHN0YW5kYXJkRm9udEZhbWlseSBSRUFEIHN0YW5kYXJkRm9udEZhbWlseSBXUklU RSBzZXRTdGFuZGFyZEZvbnRGYW1pbHkgTk9USUZZIHN0YW5kYXJkRm9udEZhbWlseUNoYW5nZWQg RklOQUwpCiAgICAgUV9QUk9QRVJUWShRU3RyaW5nIGZpeGVkRm9udEZhbWlseSBSRUFEIGZpeGVk Rm9udEZhbWlseSBXUklURSBzZXRGaXhlZEZvbnRGYW1pbHkgTk9USUZZIGZpeGVkRm9udEZhbWls eUNoYW5nZWQgRklOQUwpCkBAIC0xMDcsNiArMTA5LDEyIEBAIHB1YmxpYzoKICAgICBib29sIG5v dGlmaWNhdGlvbnNFbmFibGVkKCkgY29uc3Q7CiAgICAgdm9pZCBzZXROb3RpZmljYXRpb25zRW5h YmxlZChib29sIGVuYWJsZSk7CiAKKyAgICBib29sIHVuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJM c0FsbG93ZWQoKSBjb25zdDsKKyAgICB2b2lkIHNldFVuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJM c0FsbG93ZWQoYm9vbCBlbmFibGUpOworCisgICAgYm9vbCBmaWxlQWNjZXNzRnJvbUZpbGVVUkxz QWxsb3dlZCgpIGNvbnN0OworICAgIHZvaWQgc2V0RmlsZUFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93 ZWQoYm9vbCBlbmFibGUpOworCiAgICAgUVN0cmluZyBzdGFuZGFyZEZvbnRGYW1pbHkoKSBjb25z dDsKICAgICB2b2lkIHNldFN0YW5kYXJkRm9udEZhbWlseShjb25zdCBRU3RyaW5nJiBmYW1pbHkp OwogCkBAIC0xNTEsNiArMTU5LDggQEAgUV9TSUdOQUxTOgogICAgIHZvaWQgd2ViQXVkaW9FbmFi bGVkQ2hhbmdlZCgpOwogICAgIHZvaWQgY2FyZXRCcm93c2luZ0VuYWJsZWRDaGFuZ2VkKCk7CiAg ICAgdm9pZCBub3RpZmljYXRpb25zRW5hYmxlZENoYW5nZWQoKTsKKyAgICB2b2lkIHVuaXZlcnNh bEFjY2Vzc0Zyb21GaWxlVVJMc0FsbG93ZWRDaGFuZ2VkKCk7CisgICAgdm9pZCBmaWxlQWNjZXNz RnJvbUZpbGVVUkxzQWxsb3dlZENoYW5nZWQoKTsKIAogICAgIHZvaWQgc3RhbmRhcmRGb250RmFt aWx5Q2hhbmdlZCgpOwogICAgIHZvaWQgZml4ZWRGb250RmFtaWx5Q2hhbmdlZCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2VicHJlZmVyZW5jZXNfcF9w LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlc19wX3Au aAppbmRleCA2ZWU2OTJjMzBiY2ZhNTRiZWQ2YmFhODY5MzlmYjY0MjM1NmRlYzRiLi44NDRmZDVi NGVmMGU1YjQ2MmNkYzlhNGVlYjc0YTJlNDg3NzM1ZWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlc19wX3AuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3ZWJwcmVmZXJlbmNlc19wX3AuaApAQCAtNDEsNyAr NDEsOSBAQCBwdWJsaWM6CiAgICAgICAgIENTU0N1c3RvbUZpbHRlckVuYWJsZWQsCiAgICAgICAg IFdlYkF1ZGlvRW5hYmxlZCwKICAgICAgICAgQ2FyZXRCcm93c2luZ0VuYWJsZWQsCi0gICAgICAg IE5vdGlmaWNhdGlvbnNFbmFibGVkCisgICAgICAgIE5vdGlmaWNhdGlvbnNFbmFibGVkLAorICAg ICAgICBVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHNBbGxvd2VkLAorICAgICAgICBGaWxlQWNj ZXNzRnJvbUZpbGVVUkxzQWxsb3dlZAogICAgIH07CiAKICAgICBlbnVtIEZvbnRGYW1pbHkgewo=