63582 2011-06-28 16:28:03 -0700 [Qt] REGRESSION(r87797): Broke KDEWebKit's custom QNAM. 2011-08-05 12:48:13 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P1 Normal --- 1 adawit webkit-unassigned ademar benjamin hausmann kling menard webkit.review.bot oldest_to_newest 429245 0 adawit 2011-06-28 16:28:03 -0700 The fix applied to workaround the QNAM limitation in bug 49650 breaks custom QNAM implementations, namely kdewebkit's, that rely on the unsupportedContent signal being invoked as soon as possible instead of being queued. kdewebkit requires this functionality in order to take advantage of KIO's put-slave-on-hold functionality which allows two different applications to share the same network resource. That way a single resource will not be downloaded multiple times: once when the user clicks on the link and a second time when the appropriate application attempts to display the resource. 429256 1 98998 adawit 2011-06-28 16:37:48 -0700 Created attachment 98998 proposed patchgit diff The proposed patch uses Qt's Meta Object system, namely a dynamic property, to address this issue. If the dynamic property "SKIP_QTBUG_18718_WORKAROUND" is set, the unsupportedContent signal will be invoked directly. Otherwise, the signal connection will be queued until control returns to the event loop. 429259 2 webkit.review.bot 2011-06-28 16:38:55 -0700 Attachment 98998 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/WebCoreSupport/FrameLoade..." exit_code: 1 Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1699: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 429271 3 99001 adawit 2011-06-28 16:55:07 -0700 Created attachment 99001 proporsed patch v2 429618 4 99001 kling 2011-06-29 08:27:36 -0700 Comment on attachment 99001 proporsed patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=99001&action=review > Source/WebKit/qt/ChangeLog:5 > + [Qt] Regression: Fix for 49650 breaks custom QNAM implementations... Please end your sentences with one period, not three. > Source/WebKit/qt/ChangeLog:8 > + This is an improvement of the regression patch committed to address bug 49650. This adds no information. > Source/WebKit/qt/ChangeLog:9 > + It allows for immediate emition of the QWebPage::unsupportedContent signal emition -> emission > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:215 > + qRegisterMetaType<QNetworkReply*>("QNetworkRepyPtr"); Typo, should be "QNetworkReplyPtr". Is this the right place to register meta types? Note that this code may execute more than once. > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:242 > + // NOTE: This should be a signal-to-signal connection were it not for bugs. should -> would > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1699 > + if (page->property("SKIP_QTBUG_18718_WORKAROUND").toBool() I don't like the name of this property. Can we make it something that describes what it does instead? _q_emitUnsupportedContentDirectly perhaps? 429696 5 adawit 2011-06-29 10:07:11 -0700 (In reply to comment #4) > > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:215 > > + qRegisterMetaType<QNetworkReply*>("QNetworkRepyPtr"); > > Typo, should be "QNetworkReplyPtr". > Is this the right place to register meta types? > Note that this code may execute more than once. I do not think you need to register the meta-type each time you emit the queued signal. At least that is how I have been using that macro all these years, but I will check it again. 429702 6 99110 adawit 2011-06-29 10:18:50 -0700 Created attachment 99110 proposed patch v3 429733 7 99110 kenneth 2011-06-29 11:11:13 -0700 Comment on attachment 99110 proposed patch v3 View in context: https://bugs.webkit.org/attachment.cgi?id=99110&action=review > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1698 > + // A dynamic Qt property, _q_emitUnsupportedContentDirectly, is used here to prevent breakage > + // of custom QNAM implementations that assume this signal would not be queued, e.g kdewebkit. Why not modify kdewebkit? 429766 8 adawit 2011-06-29 12:07:09 -0700 (In reply to comment #7) > (From update of attachment 99110 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=99110&action=review > > > Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:1698 > > + // A dynamic Qt property, _q_emitUnsupportedContentDirectly, is used here to prevent breakage > > + // of custom QNAM implementations that assume this signal would not be queued, e.g kdewebkit. > > Why not modify kdewebkit? How ? kdewebkit needs the notification as soon as possible and the workaround completely prevents that from happening. The fact that the notification is needed immediately is not a simple choice in kdewebkit. It is a requirement enforced on it by the design of KIO. The way KIO 's put-slave-on-hold feature is designed, it requires the client to put the ioslave on hold as soon as it informs it of the mime-type if the client cannot handle that content-type. Otherwise, the "put-slave-on-hold" functionality will not work and the same resource would end up being downloaded at least twice: once for the original the request and the second when the application is launched to handle the request attempts to retrieve it. That won't happen if the slave is put on hold because the request the lanuched application make would be assigned to use the already parked (put-on-hold) ioslave. Anyhow, if the unsupported content signal is queued, the slot that handles this won't receive the notification on time to pause the ioslave. The ioslave would already been in the process of downloading the request. That not only causes the issue mentioned above, duplicate download of same resource, but since the call to publish the ioslave for reuse is a sync call, it causes a freeze in the application until the ioslave can interrupt itself from downloading the content to respond to our request. 436478 9 ademar 2011-07-13 09:51:34 -0700 Any news regarding this problem? Anyone planning to look at it? 436590 10 kling 2011-07-13 12:07:46 -0700 (In reply to comment #9) > Any news regarding this problem? Anyone planning to look at it? I think we should roll out the original workaround making the emission queued, as that can be worked around in user code much more easily. 437028 11 adawit 2011-07-14 04:56:51 -0700 (In reply to comment #10) > (In reply to comment #9) > > Any news regarding this problem? Anyone planning to look at it? > > I think we should roll out the original workaround making the emission queued, as that can be worked around in user code much more easily. Yes, please. Developers connecting to this signal can use Qt::QueuedConnection, if they need to use anything that creates its own local event loop. 441645 12 99110 kling 2011-07-25 07:42:31 -0700 Comment on attachment 99110 proposed patch v3 Let's roll out the previous workaround instead. 443594 13 ademar 2011-07-28 11:55:09 -0700 (In reply to comment #12) > (From update of attachment 99110 [details]) > Let's roll out the previous workaround instead. How do we go from here? Should we reopen the original bug or open a new one and attach the patch with the rollout? 444481 14 102471 adawit 2011-07-31 18:52:04 -0700 Created attachment 102471 proposed patch Here is a patch that rolls back out the source of this regression. 444747 15 menard 2011-08-01 10:22:11 -0700 (In reply to comment #14) > Created an attachment (id=102471) [details] > proposed patch > > Here is a patch that rolls back out the source of this regression. LGTM. Though the original bug should be re-open if there was any. 444779 16 ademar 2011-08-01 11:05:43 -0700 (In reply to comment #15) > (In reply to comment #14) > > Created an attachment (id=102471) [details] [details] > > proposed patch > > > > Here is a patch that rolls back out the source of this regression. > > LGTM. Though the original bug should be re-open if there was any. Yep, that's bug 49650 (which is also a regression itself). I guess it should be reopen once we land this patch (assuming we still have the problem). 445187 17 102471 kling 2011-08-02 04:45:35 -0700 Comment on attachment 102471 proposed patch r=me indeed. Please re-open the original bug when landing, as mentioned. 447176 18 ademar 2011-08-05 06:21:50 -0700 (In reply to comment #17) > (From update of attachment 102471 [details]) > r=me indeed. > Please re-open the original bug when landing, as mentioned. Dawit, anything else to change in the patch? You have to cq+ it so that it lands in the repository (or you can cq? if you're not a commiter). I would like to include it on this 2.2 weekly release so that it gets proper test exposure. 447195 19 102471 webkit.review.bot 2011-08-05 07:17:36 -0700 Comment on attachment 102471 proposed patch Clearing flags on attachment: 102471 Committed r92479: <http://trac.webkit.org/changeset/92479> 447196 20 webkit.review.bot 2011-08-05 07:17:41 -0700 All reviewed patches have been landed. Closing bug. 447358 21 ademar 2011-08-05 12:48:13 -0700 Revision r92479 cherry-picked into qtwebkit-2.2 with commit 18d52e6 <http://gitorious.org/webkit/qtwebkit/commit/18d52e6> 98998 2011-06-28 16:37:48 -0700 2011-06-28 16:55:07 -0700 proposed patchgit diff bug_63582.patch text/plain 2950 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJD bGllbnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVy Q2xpZW50UXQuY3BwCmluZGV4IDhlYzdmNjAuLjZhMDkyMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApAQCAt MjEyLDYgKzIxMiw3IEBAIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OkZyYW1lTG9hZGVyQ2xpZW50UXQo KQogICAgICwgbV9oYXNSZXByZXNlbnRhdGlvbihmYWxzZSkKICAgICAsIG1fbG9hZEVycm9yKFJl c291cmNlRXJyb3IoKSkKIHsKKyAgICBxUmVnaXN0ZXJNZXRhVHlwZTxRTmV0d29ya1JlcGx5Kj4o IlFOZXR3b3JrUmVweVB0ciIpOwogfQogCiAKQEAgLTIzOCwxMCArMjM5LDEwIEBAIHZvaWQgRnJh bWVMb2FkZXJDbGllbnRRdDo6c2V0RnJhbWUoUVdlYkZyYW1lKiB3ZWJGcmFtZSwgRnJhbWUqIGZy YW1lKQogICAgIGNvbm5lY3QodGhpcywgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksCiAgICAg ICAgICAgICBtX3dlYkZyYW1lLT5wYWdlKCksIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsK IAotICAgIC8vIEZJWE1FOiBUaGUgcXVldWVkIGNvbm5lY3Rpb24gaGVyZSBpcyBuZWVkZWQgYmVj YXVzZSBvZiBhIHByb2JsZW0gd2l0aCBRTmV0d29ya0FjY2Vzc01hbmFnZXIuCi0gICAgLy8gICAg ICAgIFNlZSBodHRwOi8vYnVncmVwb3J0cy5xdC5ub2tpYS5jb20vYnJvd3NlL1FUQlVHLTE4NzE4 CisgICAgLy8gTk9URTogVGhpcyBzaG91bGQgYmUgYSBzaWduYWwtdG8tc2lnbmFsIGNvbm5lY3Rp b24gd2VyZSBpdCBub3QgZm9yIGJ1Z3MuCisgICAgLy8gU2VlIEZyYW1lTG9hZGVyQ2xpZW50UXQ6 Om9uVW5zdXBwb3J0ZWRDb250ZW50IGZvciB0aGUgZGV0YWlscy4KICAgICBjb25uZWN0KHRoaXMs IFNJR05BTCh1bnN1cHBvcnRlZENvbnRlbnQoUU5ldHdvcmtSZXBseSopKSwKLSAgICAgICAgICAg IG1fd2ViRnJhbWUtPnBhZ2UoKSwgU0lHTkFMKHVuc3VwcG9ydGVkQ29udGVudChRTmV0d29ya1Jl cGx5KikpLCBRdDo6UXVldWVkQ29ubmVjdGlvbik7CisgICAgICAgICAgICB0aGlzLCBTTE9UKG9u VW5zdXBwb3J0ZWRDb250ZW50KFFOZXR3b3JrUmVwbHkqKSkpOwogCiAgICAgY29ubmVjdCh0aGlz LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSwKICAgICAgICAgICAgIG1fd2ViRnJhbWUsIFNJ R05BTChsb2FkRmluaXNoZWQoYm9vbCkpKTsKQEAgLTE2ODUsNiArMTY4NiwyNCBAQCBQYXNzUmVm UHRyPEZyYW1lTmV0d29ya2luZ0NvbnRleHQ+IEZyYW1lTG9hZGVyQ2xpZW50UXQ6OmNyZWF0ZU5l dHdvcmtpbmdDb250ZXh0KAogICAgIHJldHVybiBGcmFtZU5ldHdvcmtpbmdDb250ZXh0UXQ6OmNy ZWF0ZShtX2ZyYW1lLCBtX3dlYkZyYW1lLCAhTUlNRVNuaWZmaW5nRGlzYWJsZWQsIG1fd2ViRnJh bWUtPnBhZ2UoKS0+bmV0d29ya0FjY2Vzc01hbmFnZXIoKSk7CiB9CiAKK3ZvaWQgRnJhbWVMb2Fk ZXJDbGllbnRRdDo6b25VbnN1cHBvcnRlZENvbnRlbnQoUU5ldHdvcmtSZXBseSogcmVwbHkpCit7 CisgICAgLy8gRklYTUU6IFRoZSBxdWV1ZWQgY29ubmVjdGlvbiBoZXJlIGlzIG5lZWRlZCBiZWNh dXNlIG9mIGEgcHJvYmxlbSB3aXRoIFFOZXR3b3JrQWNjZXNzTWFuYWdlci4KKyAgICAvLyAgICAg ICAgU2VlIGh0dHA6Ly9idWdyZXBvcnRzLnF0Lm5va2lhLmNvbS9icm93c2UvUVRCVUctMTg3MTgK KyAgICBRV2ViUGFnZSogcGFnZSA9IG1fd2ViRnJhbWUtPnBhZ2UoKTsKKyAgICBpZiAoIXBhZ2Up CisgICAgICAgIHJldHVybjsKKworICAgIC8vIEEgZHluYW1pYyBRdCBwcm9wZXJ0eSwgU0tJUF9R VEJVR18xODcxOF9XT1JLQVJPVU5ELCBpcyB1c2VkIGhlcmUgdG8gcHJldmVudCBicmVha2FnZQor ICAgIC8vIG9mIGN1c3RvbSBRTkFNIGltcGxlbWVudGF0aW9ucyB0aGF0IGFzc3VtZSB0aGlzIHNp Z25hbCB3b3VsZCBub3QgYmUgcXVldWVkLCBlLmcga2Rld2Via2l0LgorICAgIGlmIChwYWdlLT5w cm9wZXJ0eSgiU0tJUF9RVEJVR18xODcxOF9XT1JLQVJPVU5EIikudG9Cb29sKCkgJiYKKyAgICAg ICAgUU1ldGFPYmplY3Q6Omludm9rZU1ldGhvZChwYWdlLCAidW5zdXBwb3J0ZWRDb250ZW50Iiwg UXQ6OkRpcmVjdENvbm5lY3Rpb24sIFFfQVJHKFFOZXR3b3JrUmVwbHkqLCByZXBseSkpKSB7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBRTWV0YU9iamVjdDo6aW52b2tlTWV0aG9kKHBh Z2UsICJ1bnN1cHBvcnRlZENvbnRlbnQiLCBRdDo6UXVldWVkQ29ubmVjdGlvbiwgUV9BUkcoUU5l dHdvcmtSZXBseSosIHJlcGx5KSk7Cit9CiB9CiAKK1FfREVDTEFSRV9NRVRBVFlQRShRTmV0d29y a1JlcGx5KikKICNpbmNsdWRlICJtb2NfRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAiCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQu aCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5o CmluZGV4IDEyMTMwM2QuLjFlMWZjMTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvV2Vi Q29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5oCkBAIC0yNjMsNiArMjYzLDcgQEAg cHVibGljOgogCiBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgb25JY29uTG9hZGVkRm9yUGFnZVVS TChjb25zdCBRU3RyaW5nJik7CisgICAgdm9pZCBvblVuc3VwcG9ydGVkQ29udGVudChRTmV0d29y a1JlcGx5Kik7CiAKIHByaXZhdGU6CiAgICAgRnJhbWUgKm1fZnJhbWU7Cg== 99001 2011-06-28 16:55:07 -0700 2011-06-29 10:18:50 -0700 proporsed patch v2 bug_63582.patch text/plain 4034 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggNzRiOGEyNS4uNTk5NmI0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxMS0wNi0yOCAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBS ZWdyZXNzaW9uOiBGaXggZm9yIDQ5NjUwIGJyZWFrcyBjdXN0b20gUU5BTSBpbXBsZW1lbnRhdGlv bnMuLi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYz NTgyCisKKyAgICAgICAgVGhpcyBpcyBhbiBpbXByb3ZlbWVudCBvZiB0aGUgcmVncmVzc2lvbiBw YXRjaCBjb21taXR0ZWQgdG8gYWRkcmVzcyBidWcgNDk2NTAuCisgICAgICAgIEl0IGFsbG93cyBm b3IgaW1tZWRpYXRlIGVtaXRpb24gb2YgdGhlIFFXZWJQYWdlOjp1bnN1cHBvcnRlZENvbnRlbnQg c2lnbmFsCisgICAgICAgIHdoZW4gdGhlIGR5bmFtaWMgUXQgcHJvcGVydHkgIlNLSVBfUVRCVUdf MTg3MThfV09SS0FST1VORCIgaXMgc2V0LgorCisgICAgICAgIE5vIHRlc3QgaXMgcmVxdWlyZWQu IFNhbWUgYXMgYnVnIDQ5NjUwLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpG cmFtZUxvYWRlckNsaWVudFF0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50 UXQ6OnNldEZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50UXQ6Om9u VW5zdXBwb3J0ZWRDb250ZW50KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRl ckNsaWVudFF0Lmg6CisKIDIwMTEtMDYtMjcgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMubWVuYXJk QG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJp c3RpYW5zZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50UXQuY3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9G cmFtZUxvYWRlckNsaWVudFF0LmNwcAppbmRleCA4ZWM3ZjYwLi45MTY0NzUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRR dC5jcHAKQEAgLTIxMiw2ICsyMTIsNyBAQCBGcmFtZUxvYWRlckNsaWVudFF0OjpGcmFtZUxvYWRl ckNsaWVudFF0KCkKICAgICAsIG1faGFzUmVwcmVzZW50YXRpb24oZmFsc2UpCiAgICAgLCBtX2xv YWRFcnJvcihSZXNvdXJjZUVycm9yKCkpCiB7CisgICAgcVJlZ2lzdGVyTWV0YVR5cGU8UU5ldHdv cmtSZXBseSo+KCJRTmV0d29ya1JlcHlQdHIiKTsKIH0KIAogCkBAIC0yMzgsMTAgKzIzOSwxMCBA QCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OnNldEZyYW1lKFFXZWJGcmFtZSogd2ViRnJhbWUs IEZyYW1lKiBmcmFtZSkKICAgICBjb25uZWN0KHRoaXMsIFNJR05BTChsb2FkRmluaXNoZWQoYm9v bCkpLAogICAgICAgICAgICAgbV93ZWJGcmFtZS0+cGFnZSgpLCBTSUdOQUwobG9hZEZpbmlzaGVk KGJvb2wpKSk7CiAKLSAgICAvLyBGSVhNRTogVGhlIHF1ZXVlZCBjb25uZWN0aW9uIGhlcmUgaXMg bmVlZGVkIGJlY2F1c2Ugb2YgYSBwcm9ibGVtIHdpdGggUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyLgot ICAgIC8vICAgICAgICBTZWUgaHR0cDovL2J1Z3JlcG9ydHMucXQubm9raWEuY29tL2Jyb3dzZS9R VEJVRy0xODcxOAorICAgIC8vIE5PVEU6IFRoaXMgc2hvdWxkIGJlIGEgc2lnbmFsLXRvLXNpZ25h bCBjb25uZWN0aW9uIHdlcmUgaXQgbm90IGZvciBidWdzLgorICAgIC8vIFNlZSBGcmFtZUxvYWRl ckNsaWVudFF0OjpvblVuc3VwcG9ydGVkQ29udGVudCBmb3IgdGhlIGRldGFpbHMuCiAgICAgY29u bmVjdCh0aGlzLCBTSUdOQUwodW5zdXBwb3J0ZWRDb250ZW50KFFOZXR3b3JrUmVwbHkqKSksCi0g ICAgICAgICAgICBtX3dlYkZyYW1lLT5wYWdlKCksIFNJR05BTCh1bnN1cHBvcnRlZENvbnRlbnQo UU5ldHdvcmtSZXBseSopKSwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24pOworICAgICAgICAgICAgdGhp cywgU0xPVChvblVuc3VwcG9ydGVkQ29udGVudChRTmV0d29ya1JlcGx5KikpKTsKIAogICAgIGNv bm5lY3QodGhpcywgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksCiAgICAgICAgICAgICBtX3dl YkZyYW1lLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CkBAIC0xNjg1LDYgKzE2ODYsMjMg QEAgUGFzc1JlZlB0cjxGcmFtZU5ldHdvcmtpbmdDb250ZXh0PiBGcmFtZUxvYWRlckNsaWVudFF0 OjpjcmVhdGVOZXR3b3JraW5nQ29udGV4dCgKICAgICByZXR1cm4gRnJhbWVOZXR3b3JraW5nQ29u dGV4dFF0OjpjcmVhdGUobV9mcmFtZSwgbV93ZWJGcmFtZSwgIU1JTUVTbmlmZmluZ0Rpc2FibGVk LCBtX3dlYkZyYW1lLT5wYWdlKCktPm5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCkpOwogfQogCit2b2lk IEZyYW1lTG9hZGVyQ2xpZW50UXQ6Om9uVW5zdXBwb3J0ZWRDb250ZW50KFFOZXR3b3JrUmVwbHkq IHJlcGx5KQoreworICAgIC8vIEZJWE1FOiBUaGUgcXVldWVkIGNvbm5lY3Rpb24gaGVyZSBpcyBu ZWVkZWQgYmVjYXVzZSBvZiBhIHByb2JsZW0gd2l0aCBRTmV0d29ya0FjY2Vzc01hbmFnZXIuCisg ICAgLy8gICAgICAgIFNlZSBodHRwOi8vYnVncmVwb3J0cy5xdC5ub2tpYS5jb20vYnJvd3NlL1FU QlVHLTE4NzE4CisgICAgUVdlYlBhZ2UqIHBhZ2UgPSBtX3dlYkZyYW1lLT5wYWdlKCk7CisgICAg aWYgKCFwYWdlKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBBIGR5bmFtaWMgUXQgcHJvcGVy dHksIFNLSVBfUVRCVUdfMTg3MThfV09SS0FST1VORCwgaXMgdXNlZCBoZXJlIHRvIHByZXZlbnQg YnJlYWthZ2UKKyAgICAvLyBvZiBjdXN0b20gUU5BTSBpbXBsZW1lbnRhdGlvbnMgdGhhdCBhc3N1 bWUgdGhpcyBzaWduYWwgd291bGQgbm90IGJlIHF1ZXVlZCwgZS5nIGtkZXdlYmtpdC4KKyAgICBp ZiAocGFnZS0+cHJvcGVydHkoIlNLSVBfUVRCVUdfMTg3MThfV09SS0FST1VORCIpLnRvQm9vbCgp CisgICAgICAgICYmIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2QocGFnZSwgInVuc3VwcG9ydGVk Q29udGVudCIsIFF0OjpEaXJlY3RDb25uZWN0aW9uLCBRX0FSRyhRTmV0d29ya1JlcGx5KiwgcmVw bHkpKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUU1ldGFPYmplY3Q6Omludm9rZU1ldGhvZChw YWdlLCAidW5zdXBwb3J0ZWRDb250ZW50IiwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24sIFFfQVJHKFFO ZXR3b3JrUmVwbHkqLCByZXBseSkpOworfQogfQogCitRX0RFQ0xBUkVfTUVUQVRZUEUoUU5ldHdv cmtSZXBseSopCiAjaW5jbHVkZSAibW9jX0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0 LmggYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQu aAppbmRleCAxMjEzMDNkLi4xZTFmYzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaApAQCAtMjYzLDYgKzI2Myw3IEBA IHB1YmxpYzoKIAogcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIG9uSWNvbkxvYWRlZEZvclBhZ2VV UkwoY29uc3QgUVN0cmluZyYpOworICAgIHZvaWQgb25VbnN1cHBvcnRlZENvbnRlbnQoUU5ldHdv cmtSZXBseSopOwogCiBwcml2YXRlOgogICAgIEZyYW1lICptX2ZyYW1lOwo= 99110 2011-06-29 10:18:50 -0700 2011-07-31 18:52:04 -0700 proposed patch v3 bug_63582.patch text/plain 3920 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggYmEwOTAzYy4uMWEwMGNhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxMS0wNi0yOSAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBS RUdSRVNTSU9OKHI4Nzc5Nyk6IEJyb2tlIEtERVdlYktpdCdzIGN1c3RvbSBRTkFNLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM1ODIKKworICAgICAg ICBEbyBub3QgcXVldWUgdGhlIGVtaXNzaW9uIG9mIFFXZWJQYWdlOjp1bnN1cHBvcnRlZENvbnRl bnQgd2hlbiB0aGUKKyAgICAgICAgZHluYW1pYyBRdCBwcm9wZXJ0eSAiX3FfZW1pdFVuc3VwcG9y dGVkQ29udGVudERpcmVjdGx5IiBpcyBzZXQgdG8gdHJ1ZS4KKworICAgICAgICBObyB0ZXN0IGlz IHJlcXVpcmVkLiBTYW1lIGFzIGJ1ZyA0OTY1MC4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0 L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJD bGllbnRRdDo6RnJhbWVMb2FkZXJDbGllbnRRdCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxv YWRlckNsaWVudFF0OjpzZXRGcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNs aWVudFF0OjpvblVuc3VwcG9ydGVkQ29udGVudCk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv RnJhbWVMb2FkZXJDbGllbnRRdC5oOgorCiAyMDExLTA2LTI4ICBJbHlhIFNoZXJtYW4gIDxpc2hl cm1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGll bnRRdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuY3BwCmluZGV4IDhlYzdmNjAuLmExZGMxYmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0LmNwcApAQCAtMjEy LDYgKzIxMiw3IEBAIEZyYW1lTG9hZGVyQ2xpZW50UXQ6OkZyYW1lTG9hZGVyQ2xpZW50UXQoKQog ICAgICwgbV9oYXNSZXByZXNlbnRhdGlvbihmYWxzZSkKICAgICAsIG1fbG9hZEVycm9yKFJlc291 cmNlRXJyb3IoKSkKIHsKKyAgICBxUmVnaXN0ZXJNZXRhVHlwZTxRTmV0d29ya1JlcGx5Kj4oIlFO ZXR3b3JrUmVwbHlQdHIiKTsKIH0KIAogCkBAIC0yMzgsMTAgKzIzOSwxMCBAQCB2b2lkIEZyYW1l TG9hZGVyQ2xpZW50UXQ6OnNldEZyYW1lKFFXZWJGcmFtZSogd2ViRnJhbWUsIEZyYW1lKiBmcmFt ZSkKICAgICBjb25uZWN0KHRoaXMsIFNJR05BTChsb2FkRmluaXNoZWQoYm9vbCkpLAogICAgICAg ICAgICAgbV93ZWJGcmFtZS0+cGFnZSgpLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CiAK LSAgICAvLyBGSVhNRTogVGhlIHF1ZXVlZCBjb25uZWN0aW9uIGhlcmUgaXMgbmVlZGVkIGJlY2F1 c2Ugb2YgYSBwcm9ibGVtIHdpdGggUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyLgotICAgIC8vICAgICAg ICBTZWUgaHR0cDovL2J1Z3JlcG9ydHMucXQubm9raWEuY29tL2Jyb3dzZS9RVEJVRy0xODcxOAor ICAgIC8vIE5PVEU6IFRoaXMgd2hvdWxkIGJlIGEgc2lnbmFsLXRvLXNpZ25hbCBjb25uZWN0aW9u IHdlcmUgaXQgbm90IGZvciBidWdzLgorICAgIC8vIFNlZSBGcmFtZUxvYWRlckNsaWVudFF0Ojpv blVuc3VwcG9ydGVkQ29udGVudCBmb3IgdGhlIGRldGFpbHMuCiAgICAgY29ubmVjdCh0aGlzLCBT SUdOQUwodW5zdXBwb3J0ZWRDb250ZW50KFFOZXR3b3JrUmVwbHkqKSksCi0gICAgICAgICAgICBt X3dlYkZyYW1lLT5wYWdlKCksIFNJR05BTCh1bnN1cHBvcnRlZENvbnRlbnQoUU5ldHdvcmtSZXBs eSopKSwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24pOworICAgICAgICAgICAgdGhpcywgU0xPVChvblVu c3VwcG9ydGVkQ29udGVudChRTmV0d29ya1JlcGx5KikpKTsKIAogICAgIGNvbm5lY3QodGhpcywg U0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSksCiAgICAgICAgICAgICBtX3dlYkZyYW1lLCBTSUdO QUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CkBAIC0xNjg1LDYgKzE2ODYsMjMgQEAgUGFzc1JlZlB0 cjxGcmFtZU5ldHdvcmtpbmdDb250ZXh0PiBGcmFtZUxvYWRlckNsaWVudFF0OjpjcmVhdGVOZXR3 b3JraW5nQ29udGV4dCgKICAgICByZXR1cm4gRnJhbWVOZXR3b3JraW5nQ29udGV4dFF0OjpjcmVh dGUobV9mcmFtZSwgbV93ZWJGcmFtZSwgIU1JTUVTbmlmZmluZ0Rpc2FibGVkLCBtX3dlYkZyYW1l LT5wYWdlKCktPm5ldHdvcmtBY2Nlc3NNYW5hZ2VyKCkpOwogfQogCit2b2lkIEZyYW1lTG9hZGVy Q2xpZW50UXQ6Om9uVW5zdXBwb3J0ZWRDb250ZW50KFFOZXR3b3JrUmVwbHkqIHJlcGx5KQorewor ICAgIC8vIEZJWE1FOiBUaGUgcXVldWVkIGNvbm5lY3Rpb24gaGVyZSBpcyBuZWVkZWQgYmVjYXVz ZSBvZiBhIHByb2JsZW0gd2l0aCBRTmV0d29ya0FjY2Vzc01hbmFnZXIuCisgICAgLy8gICAgICAg IFNlZSBodHRwOi8vYnVncmVwb3J0cy5xdC5ub2tpYS5jb20vYnJvd3NlL1FUQlVHLTE4NzE4Cisg ICAgUVdlYlBhZ2UqIHBhZ2UgPSBtX3dlYkZyYW1lLT5wYWdlKCk7CisgICAgaWYgKCFwYWdlKQor ICAgICAgICByZXR1cm47CisKKyAgICAvLyBBIGR5bmFtaWMgUXQgcHJvcGVydHksIF9xX2VtaXRV bnN1cHBvcnRlZENvbnRlbnREaXJlY3RseSwgaXMgdXNlZCBoZXJlIHRvIHByZXZlbnQgYnJlYWth Z2UKKyAgICAvLyBvZiBjdXN0b20gUU5BTSBpbXBsZW1lbnRhdGlvbnMgdGhhdCBhc3N1bWUgdGhp cyBzaWduYWwgd291bGQgbm90IGJlIHF1ZXVlZCwgZS5nIGtkZXdlYmtpdC4KKyAgICBpZiAocGFn ZS0+cHJvcGVydHkoIl9xX2VtaXRVbnN1cHBvcnRlZENvbnRlbnREaXJlY3RseSIpLnRvQm9vbCgp CisgICAgICAgICYmIFFNZXRhT2JqZWN0OjppbnZva2VNZXRob2QocGFnZSwgInVuc3VwcG9ydGVk Q29udGVudCIsIFF0OjpEaXJlY3RDb25uZWN0aW9uLCBRX0FSRyhRTmV0d29ya1JlcGx5KiwgcmVw bHkpKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUU1ldGFPYmplY3Q6Omludm9rZU1ldGhvZChw YWdlLCAidW5zdXBwb3J0ZWRDb250ZW50IiwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24sIFFfQVJHKFFO ZXR3b3JrUmVwbHkqLCByZXBseSkpOworfQogfQogCitRX0RFQ0xBUkVfTUVUQVRZUEUoUU5ldHdv cmtSZXBseSopCiAjaW5jbHVkZSAibW9jX0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwIgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVudFF0 LmggYi9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQu aAppbmRleCAxMjEzMDNkLi4xZTFmYzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuaApAQCAtMjYzLDYgKzI2Myw3IEBA IHB1YmxpYzoKIAogcHJpdmF0ZSBzbG90czoKICAgICB2b2lkIG9uSWNvbkxvYWRlZEZvclBhZ2VV UkwoY29uc3QgUVN0cmluZyYpOworICAgIHZvaWQgb25VbnN1cHBvcnRlZENvbnRlbnQoUU5ldHdv cmtSZXBseSopOwogCiBwcml2YXRlOgogICAgIEZyYW1lICptX2ZyYW1lOwo= 102471 2011-07-31 18:52:04 -0700 2011-08-05 07:17:35 -0700 proposed patch bug_63582.patch text/plain 1737 adawit ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cKaW5kZXggZDk3ZTEyNS4uMTViZTc1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxMS0wNy0zMSAgRGF3aXQgQWxlbWF5ZWh1ICA8YWRhd2l0QGtkZS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0 ZWQgY29tbWl0IHI4Nzc5NywgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvODc3OTcs IGJlY2F1c2UgaXQKKyAgICAgICAgY2F1c2VzIHRoZSByZWdyZXNzaW9uIHJlcG9ydGVkIHVuZGVy IGJ1ZyMgNjM1ODIuCisKKyAgICAgICAgW1F0XSBSRUdSRVNTSU9OKHI4Nzc5Nyk6IEJyb2tlIEtE RVdlYktpdCdzIGN1c3RvbSBRTkFNLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NjM1ODIKKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9h ZGVyQ2xpZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRRdDo6 c2V0RnJhbWUpOgorCiAyMDExLTA3LTI2ICBBbGV4aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBv cGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZHJlYXMgS2xpbmcuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 UXQuY3BwIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dFF0LmNwcAppbmRleCA2ZDM4YjdhLi44OTcxZmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50UXQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKQEAgLTIzMiwx MCArMjMyLDggQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudFF0OjpzZXRGcmFtZShRV2ViRnJhbWUq IHdlYkZyYW1lLCBGcmFtZSogZnJhbWUpCiAgICAgY29ubmVjdCh0aGlzLCBTSUdOQUwobG9hZFBy b2dyZXNzKGludCkpLAogICAgICAgICAgICAgbV93ZWJGcmFtZS0+cGFnZSgpLCBTSUdOQUwobG9h ZFByb2dyZXNzKGludCkpKTsKIAotICAgIC8vIEZJWE1FOiBUaGUgcXVldWVkIGNvbm5lY3Rpb24g aGVyZSBpcyBuZWVkZWQgYmVjYXVzZSBvZiBhIHByb2JsZW0gd2l0aCBRTmV0d29ya0FjY2Vzc01h bmFnZXIuCi0gICAgLy8gICAgICAgIFNlZSBodHRwOi8vYnVncmVwb3J0cy5xdC5ub2tpYS5jb20v YnJvd3NlL1FUQlVHLTE4NzE4CiAgICAgY29ubmVjdCh0aGlzLCBTSUdOQUwodW5zdXBwb3J0ZWRD b250ZW50KFFOZXR3b3JrUmVwbHkqKSksCi0gICAgICAgICAgICBtX3dlYkZyYW1lLT5wYWdlKCks IFNJR05BTCh1bnN1cHBvcnRlZENvbnRlbnQoUU5ldHdvcmtSZXBseSopKSwgUXQ6OlF1ZXVlZENv bm5lY3Rpb24pOworICAgICAgICAgICAgbV93ZWJGcmFtZS0+cGFnZSgpLCBTSUdOQUwodW5zdXBw b3J0ZWRDb250ZW50KFFOZXR3b3JrUmVwbHkqKSkpOwogCiAgICAgY29ubmVjdCh0aGlzLCBTSUdO QUwodGl0bGVDaGFuZ2VkKFFTdHJpbmcpKSwKICAgICAgICAgICAgIG1fd2ViRnJhbWUsIFNJR05B TCh0aXRsZUNoYW5nZWQoUVN0cmluZykpKTsK