36244 2010-03-17 15:02:18 -0700 [Qt] QtLauncher's FPS info should not be displayed on the terminal 2010-04-12 01:29:32 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All CLOSED FIXED Qt P2 Normal --- 35303 35784 1 jesus jesus benjamin commit-queue hausmann kenneth koshuin tonikitoo zalan oldest_to_newest 200982 0 jesus 2010-03-17 15:02:18 -0700 [Qt] QtLauncher's FPS info should be displayed on an overlay text item 200983 1 50963 jesus 2010-03-17 15:04:09 -0700 Created attachment 50963 Patch 201161 2 tonikitoo 2010-03-17 20:23:17 -0700 (In reply to comment #1) > Created an attachment (id=50963) [details] > Patch hi Jeez. In the patch, I see you new'ing, but not deleting it. Is that correct? > m_fpsTextItem = new QGraphicsTextItem("[FPS]", m_item); 201273 3 jesus 2010-03-18 07:05:47 -0700 (In reply to comment #2) > hi Jeez. In the patch, I see you new'ing, but not deleting it. Is that correct? > > > m_fpsTextItem = new QGraphicsTextItem("[FPS]", m_item); It will be deleted when its parent (m_item) is. Thanks for the comment. :) 201429 4 51062 jesus 2010-03-18 11:29:42 -0700 Created attachment 51062 Patch 201434 5 jesus 2010-03-18 11:33:49 -0700 (In reply to comment #4) > Created an attachment (id=51062) [details] > Patch Now with a background and appearing on Launcher's bottom right corner. 201441 6 51062 kenneth 2010-03-18 11:38:36 -0700 Comment on attachment 51062 Patch LGTM 201503 7 51062 commit-queue 2010-03-18 13:07:20 -0700 Comment on attachment 51062 Patch Clearing flags on attachment: 51062 Committed r56183: <http://trac.webkit.org/changeset/56183> 201504 8 commit-queue 2010-03-18 13:07:24 -0700 All reviewed patches have been landed. Closing bug. 201795 9 hausmann 2010-03-19 02:58:31 -0700 Can we please re-consider this? Adding an overlay item for an FPS counter is a pretty thing to have, but I have two concerns: 1) The overlay changes the way QtLauncher receives updates. It may have potential side-effects, which we don't want. QtLauncher should remain as pristine as possible when it comes to the way it tests WebKit behaviour. 2) The extra item is certainly not going to _improve_ the performance, instead I'm afraid it might actually product worse numbers. I like having an FPS counter in QtLauncher, it's a useful tool to have. But printing the results in a place where it does not have any side-effects sounds like better way of implementing the feature - to me that means printing it on the terminal. 201800 10 zalan 2010-03-19 03:03:53 -0700 agree with Simon, for the same reason, in yberbrowser, the fps counter is placed on a toolbar instead of the webview area. 201911 11 kenneth 2010-03-19 10:17:37 -0700 (In reply to comment #10) > agree with Simon, for the same reason, in yberbrowser, the fps counter is > placed on a toolbar instead of the webview area. I actually had some similar concerns, but neglected them as my version of yberbrowser also painted it on screen (you must have changed that later then :)). I suggest we just use the title bar / status bar for writing the FPS. Feel free to roll out. 201916 12 tonikitoo 2010-03-19 10:29:04 -0700 (In reply to comment #11) > (In reply to comment #10) > > agree with Simon, for the same reason, in yberbrowser, the fps counter is > > placed on a toolbar instead of the webview area. > > I actually had some similar concerns, but neglected them as my version of > yberbrowser also painted it on screen (you must have changed that later then > :)). > > I suggest we just use the title bar / status bar for writing the FPS. > > Feel free to roll out. If the final decision is to roll it out. I can help w/ that. I am heading back to office, and should be there in 30 min. Let me know, kenneth, pls. 202456 13 jesus 2010-03-22 06:05:42 -0700 (In reply to comment #9) > I like having an FPS counter in QtLauncher, it's a useful tool to have. But > printing the results in a place where it does not have any side-effects sounds > like better way of implementing the feature - to me that means printing it on > the terminal. Yes, we had this in mind... We changed it just because of Symbian devices, where we don't have a terminal. (In reply to comment #11) > (In reply to comment #10) > > agree with Simon, for the same reason, in yberbrowser, the fps counter is > > placed on a toolbar instead of the webview area. > > I actually had some similar concerns, but neglected them as my version of > yberbrowser also painted it on screen (you must have changed that later then > :)). Yes, it was like this when I saw it! > > I suggest we just use the title bar / status bar for writing the FPS. > > Feel free to roll out. Ok, I'll change the patch later. I'll edit the bug's title since we are not going to use overlay text items anymore. Antonio, can you roll it out please?! Thanks! :) 202506 14 tonikitoo 2010-03-22 08:28:10 -0700 > Antonio, can you roll it out please?! patch rolled out in http://trac.webkit.org/changeset/56335 202746 15 51349 jesus 2010-03-22 14:01:15 -0700 Created attachment 51349 Patch 204045 16 51349 hausmann 2010-03-25 07:21:17 -0700 Comment on attachment 51349 Patch > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > index 27d7fec..2d508cc 100644 > --- a/WebKitTools/ChangeLog > +++ b/WebKitTools/ChangeLog > @@ -1,3 +1,23 @@ > +2010-03-22 Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> > + > + Not displaying FPS info on the terminal. On S60 and Maemo the > + Window title will be used and Status bar will used on desktop. > + > + Reviewed by NOBODY (OOPS!). > + > + [Qt] QtLauncher's FPS info should not be displayed on the terminal > + https://bugs.webkit.org/show_bug.cgi?id=36244 It looks like the order of these three paragraphs is the wrong way around? :) > + if (!enable) { > +#ifndef Q_WS_MAEMO_5 && !defined(Q_WS_S60) > + statusBar()->clearMessage(); > +#else > + setWindowTitle(""); > +#endif I think it's more readable to express the preprocessor condition using positive defines, i.e. #if defined(Q_WS_MAEMO_5) || defined(Q_WS_S60) use the window title #else use the status bar #endif > +void LauncherWindow::updateFPS(int fps) > +{ > + QString fpsStatusText; > + QTextStream fpsTextStream(&fpsStatusText); > + > + fpsTextStream << "Current FPS: " << fps; Isn't using QString::arg simpler? QString statusText = QString("Current FPS: %1").arg(fps); > - bool frameRateMeasurementEnabled() { return m_measureFps; } > + bool frameRateMeasurementEnabled() { return m_measureFps; } You could make this getter const while you're at it :) I'm going to say r+, but I think the above changes would lead to more readable code, so consider doing them before landing. 204126 17 jesus 2010-03-25 10:29:00 -0700 Antonio landed the patch after I fixed what Simon asked. Commit r56553. Closing the bug as fixed. Thanks! 204509 18 hausmann 2010-03-26 05:15:25 -0700 Landed in r56553 204544 19 hausmann 2010-03-26 07:04:06 -0700 Revision r56553 cherry-picked into qtwebkit-2.0 with commit 61b094cc1b2a0e2a15058e87f1c61230fd326c29 211573 20 koshuin 2010-04-12 01:29:32 -0700 Guys maybe this comes in a bit too late, but Symbian does have a terminal... 50963 2010-03-17 15:04:09 -0700 2010-03-18 11:29:13 -0700 Patch bug-36244-20100317190556.patch text/plain 3174 jesus ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkNzFlZDMxLi5kYmI0ZWY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjIgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgYW4gb3ZlcmxheSBR R3JhcGhpY3NUZXh0SXRlbSB0byBRdExhdW5jaGVyIHNvIHdlIGNhbiBkaXNwbGF5IEZQUyBpbmZv CisgICAgICAgIG9uIHRoZSBsYXVuY2hlciBhbmQgbm90IG9uIHRoZSB0ZXJtaW5hbCBhbnltb3Jl LgorCisgICAgICAgIFtRdF0gUXRMYXVuY2hlcidzIEZQUyBpbmZvIHNob3VsZCBiZSBkaXNwbGF5 ZWQgb24gYW4gb3ZlcmxheSB0ZXh0IGl0ZW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM2MjQ0CisKKyAgICAgICAgKiBRdExhdW5jaGVyL3dlYnZpZXcu Y3BwOgorICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OldlYlZpZXdHcmFwaGljc0Jhc2Vk KToKKyAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRGcmFtZVJhdGVNZWFzdXJlbWVu dEVuYWJsZWQpOgorICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnVwZGF0ZUZyYW1lUmF0 ZSk6CisgICAgICAgICogUXRMYXVuY2hlci93ZWJ2aWV3Lmg6CisKKzIwMTAtMDMtMTcgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIEFjY2VsZXJhdGVkIENv bXBvc2l0aW5nIGlzIG5vdyBkZWZhdWx0IG9uIFF0V2ViS2l0IHNvIHRoZSBvcHRpb24KICAgICAg ICAgaW4gUXRMYXVuY2hlciBtdXN0IGJlIHRydWUgYXMgZGVmYXVsdC4KIApkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcCBiL1dlYktpdFRvb2xzL1F0TGF1bmNo ZXIvd2Vidmlldy5jcHAKaW5kZXggNTkxZTJkYS4uNTJlMDllNiAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXRUb29scy9RdExhdW5jaGVy L3dlYnZpZXcuY3BwCkBAIC00Miw2ICs0Miw3IEBAIFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpXZWJW aWV3R3JhcGhpY3NCYXNlZChRV2lkZ2V0KiBwYXJlbnQpCiAgICAgLCBtX251bVBhaW50c1NpbmNl TGFzdE1lYXN1cmUoMCkKICAgICAsIG1fbWVhc3VyZUZwcyhmYWxzZSkKICAgICAsIG1fcmVzaXpl c1RvQ29udGVudHMoZmFsc2UpCisgICAgLCBtX2Zwc1RleHRJdGVtKDApCiB7CiAgICAgc2V0U2Nl bmUobmV3IFFHcmFwaGljc1NjZW5lKHRoaXMpKTsKICAgICBzY2VuZSgpLT5hZGRJdGVtKG1faXRl bSk7CkBAIC03Nyw2ICs3OCwxMCBAQCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6V2ViVmlld0dyYXBo aWNzQmFzZWQoUVdpZGdldCogcGFyZW50KQogICAgIG1fdXBkYXRlVGltZXIgPSBuZXcgUVRpbWVy KHRoaXMpOwogICAgIG1fdXBkYXRlVGltZXItPnNldEludGVydmFsKDEwMDApOwogICAgIGNvbm5l Y3QobV91cGRhdGVUaW1lciwgU0lHTkFMKHRpbWVvdXQoKSksIHRoaXMsIFNMT1QodXBkYXRlRnJh bWVSYXRlKCkpKTsKKworICAgIG1fZnBzVGV4dEl0ZW0gPSBuZXcgUUdyYXBoaWNzVGV4dEl0ZW0o IltGUFNdIiwgbV9pdGVtKTsKKyAgICBtX2Zwc1RleHRJdGVtLT5zZXREZWZhdWx0VGV4dENvbG9y KFFDb2xvcihRdDo6cmVkKSk7CisgICAgbV9mcHNUZXh0SXRlbS0+c2V0VmlzaWJsZShmYWxzZSk7 CiB9CiAKIHZvaWQgV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnNldFJlc2l6ZXNUb0NvbnRlbnRzKGJv b2wgYikKQEAgLTEwNyw4ICsxMTIsMTEgQEAgdm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0 RnJhbWVSYXRlTWVhc3VyZW1lbnRFbmFibGVkKGJvb2wgZW5hYmxlZCkKICAgICBpZiAobV9tZWFz dXJlRnBzKSB7CiAgICAgICAgIG1fbGFzdENvbnN1bHRUaW1lID0gbV9zdGFydFRpbWUgPSBRVGlt ZTo6Y3VycmVudFRpbWUoKTsKICAgICAgICAgbV91cGRhdGVUaW1lci0+c3RhcnQoKTsKLSAgICB9 IGVsc2UgCisgICAgICAgIG1fZnBzVGV4dEl0ZW0tPnNldFZpc2libGUodHJ1ZSk7CisgICAgfSBl bHNlIHsgCiAgICAgICAgIG1fdXBkYXRlVGltZXItPnN0b3AoKTsKKyAgICAgICAgbV9mcHNUZXh0 SXRlbS0+c2V0VmlzaWJsZShmYWxzZSk7CisgICAgfQogfQogCiB2b2lkIFdlYlZpZXdHcmFwaGlj c0Jhc2VkOjp1cGRhdGVGcmFtZVJhdGUoKQpAQCAtMTIxLDcgKzEyOSwxMCBAQCB2b2lkIFdlYlZp ZXdHcmFwaGljc0Jhc2VkOjp1cGRhdGVGcmFtZVJhdGUoKQogICAgIGludCBhdmVyYWdlID0gdG90 YWwgPyBtX251bVBhaW50c1RvdGFsICogMTAwMCAvIHRvdGFsIDogMDsKICAgICBpbnQgY3VycmVu dCA9IGludGVydmFsID8gbV9udW1QYWludHNTaW5jZUxhc3RNZWFzdXJlICogMTAwMCAvIGludGVy dmFsIDogMDsKIAotICAgIHFEZWJ1ZygiW0ZQU10gYXZlcmFnZTogJWQsIGN1cnJlbnQ6ICVkIiwg YXZlcmFnZSwgY3VycmVudCk7CisgICAgUVN0cmluZyBmcHNUZXh0OworICAgIFFUZXh0U3RyZWFt IHRleHQoJmZwc1RleHQpOyAKKyAgICB0ZXh0IDw8ICJbRlBTXSBhdmVyYWdlOiAiIDw8IGF2ZXJh Z2UgPDwgIiwgY3VycmVudDogIiA8PCBjdXJyZW50OworICAgIG1fZnBzVGV4dEl0ZW0tPnNldFBs YWluVGV4dChmcHNUZXh0KTsKIAogICAgIG1fbGFzdENvbnN1bHRUaW1lID0gbm93OwogICAgIG1f bnVtUGFpbnRzU2luY2VMYXN0TWVhc3VyZSA9IDA7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9R dExhdW5jaGVyL3dlYnZpZXcuaCBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5oCmlu ZGV4IGIwOWZiMWEuLjk2OWEzNWIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIv d2Vidmlldy5oCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5oCkBAIC0xMTYs NiArMTE2LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fbWVhc3VyZUZwczsKICAgICBxcmVhbCBt X3lSb3RhdGlvbjsKICAgICBib29sIG1fcmVzaXplc1RvQ29udGVudHM7CisgICAgUUdyYXBoaWNz VGV4dEl0ZW0qIG1fZnBzVGV4dEl0ZW07CiB9OwogCiAjZW5kaWYK 51062 2010-03-18 11:29:42 -0700 2010-03-22 14:01:07 -0700 Patch bug-36244-20100318153117.patch text/plain 4675 jesus ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkNzFlZDMxLi5kYmI0ZWY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjIgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgYW4gb3ZlcmxheSBR R3JhcGhpY3NUZXh0SXRlbSB0byBRdExhdW5jaGVyIHNvIHdlIGNhbiBkaXNwbGF5IEZQUyBpbmZv CisgICAgICAgIG9uIHRoZSBsYXVuY2hlciBhbmQgbm90IG9uIHRoZSB0ZXJtaW5hbCBhbnltb3Jl LgorCisgICAgICAgIFtRdF0gUXRMYXVuY2hlcidzIEZQUyBpbmZvIHNob3VsZCBiZSBkaXNwbGF5 ZWQgb24gYW4gb3ZlcmxheSB0ZXh0IGl0ZW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM2MjQ0CisKKyAgICAgICAgKiBRdExhdW5jaGVyL3dlYnZpZXcu Y3BwOgorICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OldlYlZpZXdHcmFwaGljc0Jhc2Vk KToKKyAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRGcmFtZVJhdGVNZWFzdXJlbWVu dEVuYWJsZWQpOgorICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnVwZGF0ZUZyYW1lUmF0 ZSk6CisgICAgICAgICogUXRMYXVuY2hlci93ZWJ2aWV3Lmg6CisKKzIwMTAtMDMtMTcgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIEFjY2VsZXJhdGVkIENv bXBvc2l0aW5nIGlzIG5vdyBkZWZhdWx0IG9uIFF0V2ViS2l0IHNvIHRoZSBvcHRpb24KICAgICAg ICAgaW4gUXRMYXVuY2hlciBtdXN0IGJlIHRydWUgYXMgZGVmYXVsdC4KIApkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcCBiL1dlYktpdFRvb2xzL1F0TGF1bmNo ZXIvd2Vidmlldy5jcHAKaW5kZXggNTkxZTJkYS4uZTJjMTJhZSAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXRUb29scy9RdExhdW5jaGVy L3dlYnZpZXcuY3BwCkBAIC00Miw2ICs0Miw3IEBAIFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpXZWJW aWV3R3JhcGhpY3NCYXNlZChRV2lkZ2V0KiBwYXJlbnQpCiAgICAgLCBtX251bVBhaW50c1NpbmNl TGFzdE1lYXN1cmUoMCkKICAgICAsIG1fbWVhc3VyZUZwcyhmYWxzZSkKICAgICAsIG1fcmVzaXpl c1RvQ29udGVudHMoZmFsc2UpCisgICAgLCBtX2Zwc1RleHRJdGVtKDApCiB7CiAgICAgc2V0U2Nl bmUobmV3IFFHcmFwaGljc1NjZW5lKHRoaXMpKTsKICAgICBzY2VuZSgpLT5hZGRJdGVtKG1faXRl bSk7CkBAIC03Nyw2ICs3OCwxMCBAQCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6V2ViVmlld0dyYXBo aWNzQmFzZWQoUVdpZGdldCogcGFyZW50KQogICAgIG1fdXBkYXRlVGltZXIgPSBuZXcgUVRpbWVy KHRoaXMpOwogICAgIG1fdXBkYXRlVGltZXItPnNldEludGVydmFsKDEwMDApOwogICAgIGNvbm5l Y3QobV91cGRhdGVUaW1lciwgU0lHTkFMKHRpbWVvdXQoKSksIHRoaXMsIFNMT1QodXBkYXRlRnJh bWVSYXRlKCkpKTsKKworICAgIG1fZnBzVGV4dEl0ZW0gPSBuZXcgR3JhcGhpY3NUZXh0SXRlbSgi W0ZQU10gYXZlcmFnZTogMCwgY3VycmVudDogMCIsIG1faXRlbSk7CisgICAgbV9mcHNUZXh0SXRl bS0+c2V0RGVmYXVsdFRleHRDb2xvcihRQ29sb3IoUXQ6OnJlZCkpOworICAgIG1fZnBzVGV4dEl0 ZW0tPnNldFZpc2libGUoZmFsc2UpOwogfQogCiB2b2lkIFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpz ZXRSZXNpemVzVG9Db250ZW50cyhib29sIGIpCkBAIC05OSw2ICsxMDQsOSBAQCB2b2lkIFdlYlZp ZXdHcmFwaGljc0Jhc2VkOjpyZXNpemVFdmVudChRUmVzaXplRXZlbnQqIGV2ZW50KQogICAgICAg ICByZXR1cm47CiAgICAgUVJlY3RGIHJlY3QoUVBvaW50KDAsIDApLCBldmVudC0+c2l6ZSgpKTsK ICAgICBtX2l0ZW0tPnNldEdlb21ldHJ5KHJlY3QpOworCisgICAgbV9mcHNUZXh0SXRlbS0+c2V0 UG9zKG1faXRlbS0+c2l6ZSgpLndpZHRoKCkgLSBtX2Zwc1RleHRJdGVtLT5ib3VuZGluZ1JlY3Qo KS53aWR0aCgpIC0gMjAsCisgICAgICAgICAgICBtX2l0ZW0tPnNpemUoKS5oZWlnaHQoKSAtIG1f ZnBzVGV4dEl0ZW0tPmJvdW5kaW5nUmVjdCgpLmhlaWdodCgpIC0gMjApOwogfQogCiB2b2lkIFdl YlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRGcmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQoYm9vbCBl bmFibGVkKQpAQCAtMTA3LDggKzExNSwxMSBAQCB2b2lkIFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpz ZXRGcmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQoYm9vbCBlbmFibGVkKQogICAgIGlmIChtX21l YXN1cmVGcHMpIHsKICAgICAgICAgbV9sYXN0Q29uc3VsdFRpbWUgPSBtX3N0YXJ0VGltZSA9IFFU aW1lOjpjdXJyZW50VGltZSgpOwogICAgICAgICBtX3VwZGF0ZVRpbWVyLT5zdGFydCgpOwotICAg IH0gZWxzZSAKKyAgICAgICAgbV9mcHNUZXh0SXRlbS0+c2V0VmlzaWJsZSh0cnVlKTsKKyAgICB9 IGVsc2UgewogICAgICAgICBtX3VwZGF0ZVRpbWVyLT5zdG9wKCk7CisgICAgICAgIG1fZnBzVGV4 dEl0ZW0tPnNldFZpc2libGUoZmFsc2UpOworICAgIH0KIH0KIAogdm9pZCBXZWJWaWV3R3JhcGhp Y3NCYXNlZDo6dXBkYXRlRnJhbWVSYXRlKCkKQEAgLTEyMSw3ICsxMzIsMTAgQEAgdm9pZCBXZWJW aWV3R3JhcGhpY3NCYXNlZDo6dXBkYXRlRnJhbWVSYXRlKCkKICAgICBpbnQgYXZlcmFnZSA9IHRv dGFsID8gbV9udW1QYWludHNUb3RhbCAqIDEwMDAgLyB0b3RhbCA6IDA7CiAgICAgaW50IGN1cnJl bnQgPSBpbnRlcnZhbCA/IG1fbnVtUGFpbnRzU2luY2VMYXN0TWVhc3VyZSAqIDEwMDAgLyBpbnRl cnZhbCA6IDA7CiAKLSAgICBxRGVidWcoIltGUFNdIGF2ZXJhZ2U6ICVkLCBjdXJyZW50OiAlZCIs IGF2ZXJhZ2UsIGN1cnJlbnQpOworICAgIFFTdHJpbmcgZnBzVGV4dDsKKyAgICBRVGV4dFN0cmVh bSB0ZXh0KCZmcHNUZXh0KTsKKyAgICB0ZXh0IDw8ICJbRlBTXSBhdmVyYWdlOiAiIDw8IGF2ZXJh Z2UgPDwgIiwgY3VycmVudDogIiA8PCBjdXJyZW50OworICAgIG1fZnBzVGV4dEl0ZW0tPnNldFBs YWluVGV4dChmcHNUZXh0KTsKIAogICAgIG1fbGFzdENvbnN1bHRUaW1lID0gbm93OwogICAgIG1f bnVtUGFpbnRzU2luY2VMYXN0TWVhc3VyZSA9IDA7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9R dExhdW5jaGVyL3dlYnZpZXcuaCBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5oCmlu ZGV4IGIwOWZiMWEuLjJjMzMzYzcgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIv d2Vidmlldy5oCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5oCkBAIC02NCw2 ICs2NCwyMSBAQCBwcm90ZWN0ZWQ6CiB9OwogCiAKK2NsYXNzIEdyYXBoaWNzVGV4dEl0ZW0gOiBw dWJsaWMgUUdyYXBoaWNzVGV4dEl0ZW0geworICAgIFFfT0JKRUNUCisKK3B1YmxpYzoKKyAgICBH cmFwaGljc1RleHRJdGVtKGNvbnN0IFFTdHJpbmcmIHRleHQsIFFHcmFwaGljc0l0ZW0qIHBhcmVu dCA9IDApIDogUUdyYXBoaWNzVGV4dEl0ZW0odGV4dCwgcGFyZW50KSB7fQorCisgICAgdm9pZCBw YWludChRUGFpbnRlciAqcGFpbnRlciwgY29uc3QgUVN0eWxlT3B0aW9uR3JhcGhpY3NJdGVtICpz dHlsZSwKKyAgICAgICAgICAgICAgIFFXaWRnZXQgKndpZGdldCkKKyAgICB7CisgICAgICAgIHBh aW50ZXItPmZpbGxSZWN0KGJvdW5kaW5nUmVjdCgpLCBRQ29sb3IoMCwgMCwgMCwgMjU1KSk7Cisg ICAgICAgIFFHcmFwaGljc1RleHRJdGVtOjpwYWludChwYWludGVyLCBzdHlsZSwgd2lkZ2V0KTsK KyAgICB9Cit9OworCisKIGNsYXNzIFdlYlZpZXdHcmFwaGljc0Jhc2VkIDogcHVibGljIFFHcmFw aGljc1ZpZXcgewogICAgIFFfT0JKRUNUCiAgICAgUV9QUk9QRVJUWShxcmVhbCB5Um90YXRpb24g UkVBRCB5Um90YXRpb24gV1JJVEUgc2V0WVJvdGF0aW9uKQpAQCAtNzYsMTAgKzkxLDEwIEBAIHB1 YmxpYzoKICAgICBRR3JhcGhpY3NJdGVtOjpDYWNoZU1vZGUgaXRlbUNhY2hlTW9kZSgpIHsgcmV0 dXJuIG1faXRlbS0+Y2FjaGVNb2RlKCk7IH0KIAogICAgIHZvaWQgc2V0RnJhbWVSYXRlTWVhc3Vy ZW1lbnRFbmFibGVkKGJvb2wgZW5hYmxlZCk7Ci0gICAgYm9vbCBmcmFtZVJhdGVNZWFzdXJlbWVu dEVuYWJsZWQoKSB7IHJldHVybiBtX21lYXN1cmVGcHM7IH0gCisgICAgYm9vbCBmcmFtZVJhdGVN ZWFzdXJlbWVudEVuYWJsZWQoKSB7IHJldHVybiBtX21lYXN1cmVGcHM7IH0KIAogICAgIHZpcnR1 YWwgdm9pZCBwYWludEV2ZW50KFFQYWludEV2ZW50KiBldmVudCk7Ci0gICAgCisKICAgICB2b2lk IHNldFJlc2l6ZXNUb0NvbnRlbnRzKGJvb2wgYik7CiAKICAgICB2b2lkIHNldFlSb3RhdGlvbihx cmVhbCBhbmdsZSkKQEAgLTExNiw2ICsxMzEsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9tZWFz dXJlRnBzOwogICAgIHFyZWFsIG1feVJvdGF0aW9uOwogICAgIGJvb2wgbV9yZXNpemVzVG9Db250 ZW50czsKKyAgICBHcmFwaGljc1RleHRJdGVtKiBtX2Zwc1RleHRJdGVtOwogfTsKIAogI2VuZGlm Cg== 51349 2010-03-22 14:01:15 -0700 2010-03-25 07:21:17 -0700 Patch bug-36244-20100322180308.patch text/plain 4613 jesus ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAyN2Q3ZmVjLi4yZDUwOGNjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDMt MjIgIEplc3VzIFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3Jn PgorCisgICAgICAgIE5vdCBkaXNwbGF5aW5nIEZQUyBpbmZvIG9uIHRoZSB0ZXJtaW5hbC4gT24g UzYwIGFuZCBNYWVtbyB0aGUKKyAgICAgICAgV2luZG93IHRpdGxlIHdpbGwgYmUgdXNlZCBhbmQg U3RhdHVzIGJhciB3aWxsIHVzZWQgb24gZGVza3RvcC4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFF0TGF1bmNoZXIncyBGUFMgaW5mbyBzaG91 bGQgbm90IGJlIGRpc3BsYXllZCBvbiB0aGUgdGVybWluYWwKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MjQ0CisKKyAgICAgICAgKiBRdExhdW5jaGVy L21haW4uY3BwOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmluaXRpYWxpemVWaWV3KToKKyAg ICAgICAgKExhdW5jaGVyV2luZG93OjpzaG93RlBTKToKKyAgICAgICAgKExhdW5jaGVyV2luZG93 Ojp1cGRhdGVGUFMpOgorICAgICAgICAqIFF0TGF1bmNoZXIvd2Vidmlldy5jcHA6CisgICAgICAg IChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0RnJhbWVSYXRlTWVhc3VyZW1lbnRFbmFibGVkKToK KyAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2VkOjp1cGRhdGVGcmFtZVJhdGUpOgorICAgICAg ICAqIFF0TGF1bmNoZXIvd2Vidmlldy5oOgorICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6 OmZyYW1lUmF0ZU1lYXN1cmVtZW50RW5hYmxlZCk6CisKIDIwMTAtMDMtMjIgIENocmlzIEplcmRv bmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBC YXJ0aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAgYi9XZWJL aXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCmluZGV4IDAwYTlkMTAuLmU5MzVlNTQgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAKKysrIGIvV2ViS2l0VG9vbHMv UXRMYXVuY2hlci9tYWluLmNwcApAQCAtMTMzLDYgKzEzMyw3IEBAIHByb3RlY3RlZCBzbG90czoK IHB1YmxpYyBzbG90czoKICAgICB2b2lkIG5ld1dpbmRvdygpOwogICAgIHZvaWQgY2xvbmVXaW5k b3coKTsKKyAgICB2b2lkIHVwZGF0ZUZQUyhpbnQgZnBzKTsKIAogc2lnbmFsczoKICAgICB2b2lk IGVudGVyZWRGdWxsU2NyZWVuTW9kZShib29sIG9uKTsKQEAgLTYxMCw2ICs2MTEsOCBAQCB2b2lk IExhdW5jaGVyV2luZG93Ojppbml0aWFsaXplVmlldyhib29sIHVzZUdyYXBoaWNzVmlldykKICAg ICAgICAgaWYgKG1fZmxpcFlBbmltYXRlZCkKICAgICAgICAgICAgIGNvbm5lY3QobV9mbGlwWUFu aW1hdGVkLCBTSUdOQUwodHJpZ2dlcmVkKCkpLCB2aWV3LCBTTE9UKGFuaW1hdGVkWUZsaXAoKSkp OwogCisgICAgICAgIGNvbm5lY3QodmlldywgU0lHTkFMKGN1cnJlbnRGUFNVcGRhdGVkKGludCkp LCB0aGlzLCBTTE9UKHVwZGF0ZUZQUyhpbnQpKSk7CisKICAgICAgICAgLy8gVGhlIGltcGxlbWVu dGF0aW9uIG9mIFFBYnN0cmFjdFNjcm9sbEFyZWE6OmV2ZW50RmlsdGVyIG1ha2VzIHVzIG5lZWQK ICAgICAgICAgLy8gdG8gaW5zdGFsbCB0aGUgZXZlbnQgZmlsdGVyIG9uIHRoZSB2aWV3cG9ydCBv ZiBhIFFHcmFwaGljc1ZpZXcuCiAgICAgICAgIHZpZXctPnZpZXdwb3J0KCktPmluc3RhbGxFdmVu dEZpbHRlcih0aGlzKTsKQEAgLTY0OCw2ICs2NTEsMTQgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6 c2hvd0ZQUyhib29sIGVuYWJsZSkKICAgICBnU2hvd0ZyYW1lUmF0ZSA9IGVuYWJsZTsKICAgICBX ZWJWaWV3R3JhcGhpY3NCYXNlZCogdmlldyA9IHN0YXRpY19jYXN0PFdlYlZpZXdHcmFwaGljc0Jh c2VkKj4obV92aWV3KTsKICAgICB2aWV3LT5zZXRGcmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQo ZW5hYmxlKTsKKworICAgIGlmICghZW5hYmxlKSB7CisjaWZuZGVmIFFfV1NfTUFFTU9fNSAmJiAh ZGVmaW5lZChRX1dTX1M2MCkKKyAgICAgICAgc3RhdHVzQmFyKCktPmNsZWFyTWVzc2FnZSgpOwor I2Vsc2UKKyAgICAgICAgc2V0V2luZG93VGl0bGUoIiIpOworI2VuZGlmCisgICAgfQogfQogCiB2 b2lkIExhdW5jaGVyV2luZG93OjpjaGFuZ2VWaWV3cG9ydFVwZGF0ZU1vZGUoaW50IG1vZGUpCkBA IC02NzMsNiArNjg0LDIwIEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmNsb25lV2luZG93KCkKICAg ICBtdy0+c2hvdygpOwogfQogCit2b2lkIExhdW5jaGVyV2luZG93Ojp1cGRhdGVGUFMoaW50IGZw cykKK3sKKyAgICBRU3RyaW5nIGZwc1N0YXR1c1RleHQ7CisgICAgUVRleHRTdHJlYW0gZnBzVGV4 dFN0cmVhbSgmZnBzU3RhdHVzVGV4dCk7CisKKyAgICBmcHNUZXh0U3RyZWFtIDw8ICJDdXJyZW50 IEZQUzogIiA8PCBmcHM7CisKKyNpZm5kZWYgUV9XU19NQUVNT181ICYmICFkZWZpbmVkKFFfV1Nf UzYwKQorICAgIHN0YXR1c0JhcigpLT5zaG93TWVzc2FnZShmcHNTdGF0dXNUZXh0KTsKKyNlbHNl CisgICAgc2V0V2luZG93VGl0bGUoZnBzU3RhdHVzVGV4dCk7CisjZW5kaWYKK30KKwogdm9pZCBM YXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hyb21lKCkKIHsKICAgICBRTWVudSogZmlsZU1lbnUgPSBt ZW51QmFyKCktPmFkZE1lbnUoIiZGaWxlIik7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExh dW5jaGVyL3dlYnZpZXcuY3BwIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcApp bmRleCA1OTFlMmRhLi44Yzk0NDM4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVy L3dlYnZpZXcuY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5jcHAKQEAg LTEwNyw3ICsxMDcsNyBAQCB2b2lkIFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRGcmFtZVJhdGVN ZWFzdXJlbWVudEVuYWJsZWQoYm9vbCBlbmFibGVkKQogICAgIGlmIChtX21lYXN1cmVGcHMpIHsK ICAgICAgICAgbV9sYXN0Q29uc3VsdFRpbWUgPSBtX3N0YXJ0VGltZSA9IFFUaW1lOjpjdXJyZW50 VGltZSgpOwogICAgICAgICBtX3VwZGF0ZVRpbWVyLT5zdGFydCgpOwotICAgIH0gZWxzZSAKKyAg ICB9IGVsc2UKICAgICAgICAgbV91cGRhdGVUaW1lci0+c3RvcCgpOwogfQogCkBAIC0xMjEsNyAr MTIxLDcgQEAgdm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6dXBkYXRlRnJhbWVSYXRlKCkKICAg ICBpbnQgYXZlcmFnZSA9IHRvdGFsID8gbV9udW1QYWludHNUb3RhbCAqIDEwMDAgLyB0b3RhbCA6 IDA7CiAgICAgaW50IGN1cnJlbnQgPSBpbnRlcnZhbCA/IG1fbnVtUGFpbnRzU2luY2VMYXN0TWVh c3VyZSAqIDEwMDAgLyBpbnRlcnZhbCA6IDA7CiAKLSAgICBxRGVidWcoIltGUFNdIGF2ZXJhZ2U6 ICVkLCBjdXJyZW50OiAlZCIsIGF2ZXJhZ2UsIGN1cnJlbnQpOworICAgIGVtaXQgY3VycmVudEZQ U1VwZGF0ZWQoY3VycmVudCk7CiAKICAgICBtX2xhc3RDb25zdWx0VGltZSA9IG5vdzsKICAgICBt X251bVBhaW50c1NpbmNlTGFzdE1lYXN1cmUgPSAwOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv UXRMYXVuY2hlci93ZWJ2aWV3LmggYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL3dlYnZpZXcuaApp bmRleCBlYjQxZTI0Li40YmIwZDc2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVy L3dlYnZpZXcuaAorKysgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL3dlYnZpZXcuaApAQCAtNzYs MTAgKzc2LDEwIEBAIHB1YmxpYzoKICAgICBRR3JhcGhpY3NJdGVtOjpDYWNoZU1vZGUgaXRlbUNh Y2hlTW9kZSgpIHsgcmV0dXJuIG1faXRlbS0+Y2FjaGVNb2RlKCk7IH0KIAogICAgIHZvaWQgc2V0 RnJhbWVSYXRlTWVhc3VyZW1lbnRFbmFibGVkKGJvb2wgZW5hYmxlZCk7Ci0gICAgYm9vbCBmcmFt ZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQoKSB7IHJldHVybiBtX21lYXN1cmVGcHM7IH0gCisgICAg Ym9vbCBmcmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQoKSB7IHJldHVybiBtX21lYXN1cmVGcHM7 IH0KIAogICAgIHZpcnR1YWwgdm9pZCBwYWludEV2ZW50KFFQYWludEV2ZW50KiBldmVudCk7Ci0g ICAgCisKICAgICB2b2lkIHNldFJlc2l6ZXNUb0NvbnRlbnRzKGJvb2wgYik7CiAKICAgICB2b2lk IHNldFlSb3RhdGlvbihxcmVhbCBhbmdsZSkKQEAgLTk3LDcgKzk3LDcgQEAgcHVibGljOgogICAg IHsKICAgICAgICAgcmV0dXJuIG1feVJvdGF0aW9uOwogICAgIH0KLSAgICAKKwogICAgIEdyYXBo aWNzV2ViVmlldyogZ3JhcGhpY3NXZWJWaWV3KCkgY29uc3QgeyByZXR1cm4gbV9pdGVtOyB9CiAK IHB1YmxpYyBzbG90czoKQEAgLTEwNyw2ICsxMDcsNyBAQCBwdWJsaWMgc2xvdHM6CiAKIHNpZ25h bHM6CiAgICAgdm9pZCB5RmxpcFJlcXVlc3QoKTsKKyAgICB2b2lkIGN1cnJlbnRGUFNVcGRhdGVk KGludCBmcHMpOwogCiBwcml2YXRlOgogICAgIEdyYXBoaWNzV2ViVmlldyogbV9pdGVtOwo=