36270 2010-03-17 20:09:08 -0700 [Qt] QtLauncher needs an option to Enable/Disable a QGLWidget as Viewport 2010-03-26 08:45:47 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All CLOSED FIXED Qt P2 Normal --- 35303 35784 1 jesus jesus hausmann ossy oldest_to_newest 201151 0 jesus 2010-03-17 20:09:08 -0700 [Qt] QtLauncher needs an option to Enable/Disable a QGLWidget as Viewport 201154 1 50999 jesus 2010-03-17 20:17:07 -0700 Created attachment 50999 Patch 201206 2 50999 hausmann 2010-03-18 00:24:53 -0700 Comment on attachment 50999 Patch No general objections, but this needs to be #ifdef, as it breaks the build with Qt configuration where there is no OpenGL support. Symbian is one of those platforms where OpenGL is not available. 201303 3 51024 jesus 2010-03-18 08:16:01 -0700 Created attachment 51024 Patch 201305 4 jesus 2010-03-18 08:19:59 -0700 (In reply to comment #3) > Created an attachment (id=51024) [details] > Patch Thanks for the review. :) I didn't find any macro or global define on Qt's 4.7 documentation to handle this, so what I did was just to ensure that we are not building on Symbian. Is that ok? 201773 5 51024 hausmann 2010-03-19 00:53:46 -0700 Comment on attachment 51024 Patch I'm sorry, I should've been more specific :(. I didn't mean to disable OpenGl for S60 but when it's not enabled in Qt in general. S60 was just an example. For example it's not unusual that Qt fo Embedded Linux is compiled without OpenGL support, too. You can verify that OpenGL support is available in the .pro file using contains(QT_CONFIG, opengl) { do opengl things } In addition there's a QT_NO_OPENGL define set when Qt is configured without OpenGL support. 203129 6 51442 jesus 2010-03-23 11:40:07 -0700 Created attachment 51442 Patch 203130 7 jesus 2010-03-23 11:45:21 -0700 (In reply to comment #5) > (From update of attachment 51024 [details]) > I'm sorry, I should've been more specific :(. I didn't mean to disable OpenGl > for S60 but when it's not enabled in Qt in general. S60 was just an example. I'm sorry that I didn't understand it correctly at first place. :) > You can verify that OpenGL support is available in the .pro file using > > contains(QT_CONFIG, opengl) { > do opengl things > } > > In addition there's a QT_NO_OPENGL define set when Qt is configured without > OpenGL support. Thanks for the tips! I didn't find this QT_NO_OPENGL define documented anywhere besides Qt src itself, so I sticked to the .pro approach. 203143 8 ossy 2010-03-23 12:10:44 -0700 Attachment 51442 did not build on qt: Build output: http://webkit-commit-queue.appspot.com/results/1087005 203162 9 51447 jesus 2010-03-23 13:16:20 -0700 Created attachment 51447 Patch Trying to fix the build failure. 204530 10 jesus 2010-03-26 06:00:50 -0700 Rebased and Committed as r56618 by Antonio. Thanks! 204594 11 hausmann 2010-03-26 08:42:46 -0700 cherry-pick-for-backport: <r56618> 204600 12 hausmann 2010-03-26 08:45:38 -0700 Revision r56618 cherry-picked into qtwebkit-2.0 with commit 8221def16a71a7ec51d582ce69f1bfdd6bab8a18 50999 2010-03-17 20:17:07 -0700 2010-03-18 08:15:30 -0700 Patch bug-36270-20100318001817.patch text/plain 4760 jesus ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkYmI0ZWY2Li41YTg4ODc2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgYW4gb3B0aW9uIHRv IFF0TGF1bmNoZXIgdG8gZW5hYmxlL2Rpc2FibGUgYSBRR0xXaWRnZXQgYXMgVmlld3BvcnQKKyAg ICAgICAgb2YgdGhlIFFHcmFwaGljc1ZpZXcgd2hlbiB0aGUgbGF1bmNoZXIgaXMgcnVubmluZyBv biBncmFwaGljc3ZpZXcgbW9kZS4KKworICAgICAgICBbUXRdIFF0TGF1bmNoZXIgbmVlZHMgYW4g b3B0aW9uIHRvIEVuYWJsZS9EaXNhYmxlIGEgUUdMV2lkZ2V0IGFzIFZpZXdwb3J0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjI3MAorCisgICAgICAg ICogUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybzoKKyAgICAgICAgKiBRdExhdW5jaGVyL21haW4u Y3BwOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OnRvZ2dsZVFHTFdpZGdldFZpZXdwb3J0KToK KyAgICAgICAgKExhdW5jaGVyV2luZG93OjpjcmVhdGVDaHJvbWUpOgorCisyMDEwLTAzLTE3ICBK ZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBBZGQgYW4gb3Zl cmxheSBRR3JhcGhpY3NUZXh0SXRlbSB0byBRdExhdW5jaGVyIHNvIHdlIGNhbiBkaXNwbGF5IEZQ UyBpbmZvCiAgICAgICAgIG9uIHRoZSBsYXVuY2hlciBhbmQgbm90IG9uIHRoZSB0ZXJtaW5hbCBh bnltb3JlLgogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL1F0TGF1bmNoZXIu cHJvIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybwppbmRleCA4NzkzZDdl Li5kZDFhMDc1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL1F0TGF1bmNoZXIu cHJvCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8KQEAgLTI2LDcg KzI2LDcgQEAgaW5jbHVkZSguLi8uLi9XZWJLaXQucHJpKQogCiBERVNURElSID0gJCRPVVRQVVRf RElSL2JpbgogCi1RVCArPSBuZXR3b3JrCitRVCArPSBuZXR3b3JrIG9wZW5nbAogbWFjeDpRVCs9 eG1sCiAKIGxpbnV4LSogewpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWlu LmNwcCBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAKaW5kZXggYWUwOWY2NS4uMDli ODRhZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcAorKysgYi9X ZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCkBAIC0zMiw2ICszMiw3IEBACiAKICNpbmNs dWRlIDxRdEd1aT4KICNpbmNsdWRlIDxRdE5ldHdvcmsvUU5ldHdvcmtSZXF1ZXN0PgorI2luY2x1 ZGUgPFF0T3BlbkdML1FHTFdpZGdldD4KICNpZiAhZGVmaW5lZChRVF9OT19QUklOVEVSKQogI2lu Y2x1ZGUgPFFQcmludFByZXZpZXdEaWFsb2c+CiAjZW5kaWYKQEAgLTc5LDYgKzgwLDcgQEAgc3Rh dGljIFFHcmFwaGljc1ZpZXc6OlZpZXdwb3J0VXBkYXRlTW9kZSBnVmlld3BvcnRVcGRhdGVNb2Rl ID0gUUdyYXBoaWNzVmlldzo6TWkKIHN0YXRpYyBRVXJsIGdJbnNwZWN0b3JVcmw7CiBzdGF0aWMg Ym9vbCBnUmVzaXplc1RvQ29udGVudHMgPSBmYWxzZTsKIHN0YXRpYyBib29sIGdVc2VUaWxlZEJh Y2tpbmdTdG9yZSA9IGZhbHNlOworc3RhdGljIGJvb2wgZ1VzZVFHTFdpZGdldFZpZXdwb3J0ID0g ZmFsc2U7CiAKIGNsYXNzIExhdW5jaGVyV2luZG93IDogcHVibGljIE1haW5XaW5kb3cgewogICAg IFFfT0JKRUNUCkBAIC0xMjEsMTMgKzEyMywxNCBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9p ZCB0b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nKGJvb2wgdG9nZ2xlKTsKICAgICB2b2lkIHRv Z2dsZVRpbGVkQmFja2luZ1N0b3JlKGJvb2wgdG9nZ2xlKTsKICAgICB2b2lkIHRvZ2dsZVJlc2l6 ZXNUb0NvbnRlbnRzKGJvb2wgdG9nZ2xlKTsKLSAgICAKKwogICAgIHZvaWQgdG9nZ2xlV2ViR0wo Ym9vbCB0b2dnbGUpOwogICAgIHZvaWQgaW5pdGlhbGl6ZVZpZXcoYm9vbCB1c2VHcmFwaGljc1Zp ZXcgPSBmYWxzZSk7CiAgICAgdm9pZCB0b2dnbGVTcGF0aWFsTmF2aWdhdGlvbihib29sIGIpOwog ICAgIHZvaWQgdG9nZ2xlRnVsbFNjcmVlbk1vZGUoYm9vbCBlbmFibGUpOwogICAgIHZvaWQgc2hv d0ZQUyhib29sIGVuYWJsZSk7CiAgICAgdm9pZCBjaGFuZ2VWaWV3cG9ydFVwZGF0ZU1vZGUoaW50 IG1vZGUpOworICAgIHZvaWQgdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQoYm9vbCBlbmFibGUpOwog CiBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBuZXdXaW5kb3coKTsKQEAgLTYyMyw2ICs2MjYsMTcg QEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6Y2hhbmdlVmlld3BvcnRVcGRhdGVNb2RlKGludCBtb2Rl KQogICAgIHZpZXctPnNldFZpZXdwb3J0VXBkYXRlTW9kZShnVmlld3BvcnRVcGRhdGVNb2RlKTsK IH0KIAordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQoYm9vbCBl bmFibGUpCit7CisgICAgaWYgKCFpc0dyYXBoaWNzQmFzZWQoKSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgZ1VzZVFHTFdpZGdldFZpZXdwb3J0ID0gZW5hYmxlOworICAgIFdlYlZpZXdHcmFwaGlj c0Jhc2VkKiB2aWV3ID0gc3RhdGljX2Nhc3Q8V2ViVmlld0dyYXBoaWNzQmFzZWQqPihtX3ZpZXcp OworCisgICAgdmlldy0+c2V0Vmlld3BvcnQoZW5hYmxlID8gbmV3IFFHTFdpZGdldCgpIDogMCk7 Cit9CisKIHZvaWQgTGF1bmNoZXJXaW5kb3c6Om5ld1dpbmRvdygpCiB7CiAgICAgTGF1bmNoZXJX aW5kb3cqIG13ID0gbmV3IExhdW5jaGVyV2luZG93KHRoaXMsIGZhbHNlKTsKQEAgLTcyNCwxMyAr NzM4LDEzIEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSgpCiAgICAgdG9nZ2xl QWNjZWxlcmF0ZWRDb21wb3NpdGluZy0+c2V0Q2hlY2tlZChzZXR0aW5ncy0+dGVzdEF0dHJpYnV0 ZShRV2ViU2V0dGluZ3M6OkFjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFibGVkKSk7CiAgICAgdG9n Z2xlQWNjZWxlcmF0ZWRDb21wb3NpdGluZy0+c2V0RW5hYmxlZChpc0dyYXBoaWNzQmFzZWQoKSk7 CiAgICAgdG9nZ2xlQWNjZWxlcmF0ZWRDb21wb3NpdGluZy0+Y29ubmVjdCh0b2dnbGVHcmFwaGlj c1ZpZXcsIFNJR05BTCh0b2dnbGVkKGJvb2wpKSwgU0xPVChzZXRFbmFibGVkKGJvb2wpKSk7Ci0g ICAgCisKICAgICBRQWN0aW9uKiB0b2dnbGVSZXNpemVzVG9Db250ZW50cyA9IGdyYXBoaWNzVmll d01lbnUtPmFkZEFjdGlvbigiVG9nZ2xlIFJlc2l6ZXMgVG8gQ29udGVudHMgTW9kZSIsIHRoaXMs IFNMT1QodG9nZ2xlUmVzaXplc1RvQ29udGVudHMoYm9vbCkpKTsKICAgICB0b2dnbGVSZXNpemVz VG9Db250ZW50cy0+c2V0Q2hlY2thYmxlKHRydWUpOwogICAgIHRvZ2dsZVJlc2l6ZXNUb0NvbnRl bnRzLT5zZXRDaGVja2VkKGZhbHNlKTsKICAgICB0b2dnbGVSZXNpemVzVG9Db250ZW50cy0+c2V0 RW5hYmxlZChmYWxzZSk7CiAgICAgdG9nZ2xlUmVzaXplc1RvQ29udGVudHMtPmNvbm5lY3QodG9n Z2xlR3JhcGhpY3NWaWV3LCBTSUdOQUwodG9nZ2xlZChib29sKSksIFNMT1Qoc2V0RW5hYmxlZChi b29sKSkpOwotICAgIAorCiAgICAgUUFjdGlvbiogdG9nZ2xlVGlsZWRCYWNraW5nU3RvcmUgPSBn cmFwaGljc1ZpZXdNZW51LT5hZGRBY3Rpb24oIlRvZ2dsZSBUaWxlZCBCYWNraW5nIFN0b3JlIiwg dGhpcywgU0xPVCh0b2dnbGVUaWxlZEJhY2tpbmdTdG9yZShib29sKSkpOwogICAgIHRvZ2dsZVRp bGVkQmFja2luZ1N0b3JlLT5zZXRDaGVja2FibGUodHJ1ZSk7CiAgICAgdG9nZ2xlVGlsZWRCYWNr aW5nU3RvcmUtPnNldENoZWNrZWQoZmFsc2UpOwpAQCAtNzQxLDYgKzc1NSwxMiBAQCB2b2lkIExh dW5jaGVyV2luZG93OjpjcmVhdGVDaHJvbWUoKQogICAgIHNwYXRpYWxOYXZpZ2F0aW9uQWN0aW9u LT5zZXRDaGVja2FibGUodHJ1ZSk7CiAgICAgc3BhdGlhbE5hdmlnYXRpb25BY3Rpb24tPnNldFNo b3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6Q1RSTCB8IFF0OjpTSElGVCB8IFF0OjpLZXlfUykpOwog CisgICAgUUFjdGlvbiogdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQgPSBncmFwaGljc1ZpZXdNZW51 LT5hZGRBY3Rpb24oIlRvZ2dsZSB1c2Ugb2YgUUdMV2lkZ2V0IFZpZXdwb3J0IiwgdGhpcywgU0xP VCh0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydChib29sKSkpOworICAgIHRvZ2dsZVFHTFdpZGdldFZp ZXdwb3J0LT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQt PnNldENoZWNrZWQoZ1VzZVFHTFdpZGdldFZpZXdwb3J0KTsKKyAgICB0b2dnbGVRR0xXaWRnZXRW aWV3cG9ydC0+c2V0RW5hYmxlZChpc0dyYXBoaWNzQmFzZWQoKSk7CisgICAgdG9nZ2xlUUdMV2lk Z2V0Vmlld3BvcnQtPmNvbm5lY3QodG9nZ2xlR3JhcGhpY3NWaWV3LCBTSUdOQUwodG9nZ2xlZChi b29sKSksIFNMT1Qoc2V0RW5hYmxlZChib29sKSkpOworCiAgICAgZ3JhcGhpY3NWaWV3TWVudS0+ YWRkU2VwYXJhdG9yKCk7CiAKICAgICBtX2ZsaXBBbmltYXRlZCA9IGdyYXBoaWNzVmlld01lbnUt PmFkZEFjdGlvbigiQW5pbWF0ZWQgRmxpcCIpOwo= 51024 2010-03-18 08:16:01 -0700 2010-03-23 11:39:58 -0700 Patch bug-36270-20100318121737.patch text/plain 5104 jesus ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkYmI0ZWY2Li41YTg4ODc2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEgQEAKIAogICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBBZGQgYW4gb3B0aW9uIHRv IFF0TGF1bmNoZXIgdG8gZW5hYmxlL2Rpc2FibGUgYSBRR0xXaWRnZXQgYXMgVmlld3BvcnQKKyAg ICAgICAgb2YgdGhlIFFHcmFwaGljc1ZpZXcgd2hlbiB0aGUgbGF1bmNoZXIgaXMgcnVubmluZyBv biBncmFwaGljc3ZpZXcgbW9kZS4KKworICAgICAgICBbUXRdIFF0TGF1bmNoZXIgbmVlZHMgYW4g b3B0aW9uIHRvIEVuYWJsZS9EaXNhYmxlIGEgUUdMV2lkZ2V0IGFzIFZpZXdwb3J0CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNjI3MAorCisgICAgICAg ICogUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybzoKKyAgICAgICAgKiBRdExhdW5jaGVyL21haW4u Y3BwOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OnRvZ2dsZVFHTFdpZGdldFZpZXdwb3J0KToK KyAgICAgICAgKExhdW5jaGVyV2luZG93OjpjcmVhdGVDaHJvbWUpOgorCisyMDEwLTAzLTE3ICBK ZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBBZGQgYW4gb3Zl cmxheSBRR3JhcGhpY3NUZXh0SXRlbSB0byBRdExhdW5jaGVyIHNvIHdlIGNhbiBkaXNwbGF5IEZQ UyBpbmZvCiAgICAgICAgIG9uIHRoZSBsYXVuY2hlciBhbmQgbm90IG9uIHRoZSB0ZXJtaW5hbCBh bnltb3JlLgogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL1F0TGF1bmNoZXIu cHJvIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybwppbmRleCA4NzkzZDdl Li5lZWE3ZWRjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL1F0TGF1bmNoZXIu cHJvCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8KQEAgLTI3LDcg KzI3LDcgQEAgaW5jbHVkZSguLi8uLi9XZWJLaXQucHJpKQogREVTVERJUiA9ICQkT1VUUFVUX0RJ Ui9iaW4KIAogUVQgKz0gbmV0d29yawotbWFjeDpRVCs9eG1sCittYWN4OlFUKz14bWwgb3Blbmds CiAKIGxpbnV4LSogewogICAgICMgRnJvbSBDcmVhdG9yJ3Mgc3JjL3JwYXRoLnByaToKQEAgLTM4 LDYgKzM4LDggQEAgbGludXgtKiB7CiAKICAgICBRTUFLRV9MRkxBR1MgKz0gLVdsLC16LG9yaWdp biBcJy1XbCwtcnBhdGgsJCR7TVlfUlBBVEh9XCcKICAgICBRTUFLRV9SUEFUSERJUiA9CisKKyAg ICBRVCArPSBvcGVuZ2wKIH0gZWxzZSB7CiAgICAgUU1BS0VfUlBBVEhESVIgPSAkJE9VVFBVVF9E SVIvbGliICQkUU1BS0VfUlBBVEhESVIKIH0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0TGF1 bmNoZXIvbWFpbi5jcHAgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCmluZGV4IGFl MDlmNjUuLmMwOGM3OGIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5j cHAKKysrIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcApAQCAtMzIsNiArMzIsMTEg QEAKIAogI2luY2x1ZGUgPFF0R3VpPgogI2luY2x1ZGUgPFF0TmV0d29yay9RTmV0d29ya1JlcXVl c3Q+CisKKyNpZiAhZGVmaW5lZChRX1dTX1M2MCkKKyNpbmNsdWRlIDxRdE9wZW5HTC9RR0xXaWRn ZXQ+CisjZW5kaWYKKwogI2lmICFkZWZpbmVkKFFUX05PX1BSSU5URVIpCiAjaW5jbHVkZSA8UVBy aW50UHJldmlld0RpYWxvZz4KICNlbmRpZgpAQCAtODAsNiArODUsMTAgQEAgc3RhdGljIFFVcmwg Z0luc3BlY3RvclVybDsKIHN0YXRpYyBib29sIGdSZXNpemVzVG9Db250ZW50cyA9IGZhbHNlOwog c3RhdGljIGJvb2wgZ1VzZVRpbGVkQmFja2luZ1N0b3JlID0gZmFsc2U7CiAKKyNpZiAhZGVmaW5l ZChRX1dTX1M2MCkKK3N0YXRpYyBib29sIGdVc2VRR0xXaWRnZXRWaWV3cG9ydCA9IGZhbHNlOwor I2VuZGlmCisKIGNsYXNzIExhdW5jaGVyV2luZG93IDogcHVibGljIE1haW5XaW5kb3cgewogICAg IFFfT0JKRUNUCiAKQEAgLTEyMSw3ICsxMzAsNyBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9p ZCB0b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nKGJvb2wgdG9nZ2xlKTsKICAgICB2b2lkIHRv Z2dsZVRpbGVkQmFja2luZ1N0b3JlKGJvb2wgdG9nZ2xlKTsKICAgICB2b2lkIHRvZ2dsZVJlc2l6 ZXNUb0NvbnRlbnRzKGJvb2wgdG9nZ2xlKTsKLSAgICAKKwogICAgIHZvaWQgdG9nZ2xlV2ViR0wo Ym9vbCB0b2dnbGUpOwogICAgIHZvaWQgaW5pdGlhbGl6ZVZpZXcoYm9vbCB1c2VHcmFwaGljc1Zp ZXcgPSBmYWxzZSk7CiAgICAgdm9pZCB0b2dnbGVTcGF0aWFsTmF2aWdhdGlvbihib29sIGIpOwpA QCAtMTI5LDYgKzEzOCwxMCBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCBzaG93RlBTKGJv b2wgZW5hYmxlKTsKICAgICB2b2lkIGNoYW5nZVZpZXdwb3J0VXBkYXRlTW9kZShpbnQgbW9kZSk7 CiAKKyNpZiAhZGVmaW5lZChRX1dTX1M2MCkKKyAgICB2b2lkIHRvZ2dsZVFHTFdpZGdldFZpZXdw b3J0KGJvb2wgZW5hYmxlKTsKKyNlbmRpZgorCiBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBuZXdX aW5kb3coKTsKICAgICB2b2lkIGNsb25lV2luZG93KCk7CkBAIC02MjMsNiArNjM2LDE5IEBAIHZv aWQgTGF1bmNoZXJXaW5kb3c6OmNoYW5nZVZpZXdwb3J0VXBkYXRlTW9kZShpbnQgbW9kZSkKICAg ICB2aWV3LT5zZXRWaWV3cG9ydFVwZGF0ZU1vZGUoZ1ZpZXdwb3J0VXBkYXRlTW9kZSk7CiB9CiAK KyNpZiAhZGVmaW5lZChRX1dTX1M2MCkKK3ZvaWQgTGF1bmNoZXJXaW5kb3c6OnRvZ2dsZVFHTFdp ZGdldFZpZXdwb3J0KGJvb2wgZW5hYmxlKQoreworICAgIGlmICghaXNHcmFwaGljc0Jhc2VkKCkp CisgICAgICAgIHJldHVybjsKKworICAgIGdVc2VRR0xXaWRnZXRWaWV3cG9ydCA9IGVuYWJsZTsK KyAgICBXZWJWaWV3R3JhcGhpY3NCYXNlZCogdmlldyA9IHN0YXRpY19jYXN0PFdlYlZpZXdHcmFw aGljc0Jhc2VkKj4obV92aWV3KTsKKworICAgIHZpZXctPnNldFZpZXdwb3J0KGVuYWJsZSA/IG5l dyBRR0xXaWRnZXQoKSA6IDApOworfQorI2VuZGlmCisKIHZvaWQgTGF1bmNoZXJXaW5kb3c6Om5l d1dpbmRvdygpCiB7CiAgICAgTGF1bmNoZXJXaW5kb3cqIG13ID0gbmV3IExhdW5jaGVyV2luZG93 KHRoaXMsIGZhbHNlKTsKQEAgLTcyNCwxMyArNzUwLDEzIEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6 OmNyZWF0ZUNocm9tZSgpCiAgICAgdG9nZ2xlQWNjZWxlcmF0ZWRDb21wb3NpdGluZy0+c2V0Q2hl Y2tlZChzZXR0aW5ncy0+dGVzdEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OkFjY2VsZXJhdGVkQ29t cG9zaXRpbmdFbmFibGVkKSk7CiAgICAgdG9nZ2xlQWNjZWxlcmF0ZWRDb21wb3NpdGluZy0+c2V0 RW5hYmxlZChpc0dyYXBoaWNzQmFzZWQoKSk7CiAgICAgdG9nZ2xlQWNjZWxlcmF0ZWRDb21wb3Np dGluZy0+Y29ubmVjdCh0b2dnbGVHcmFwaGljc1ZpZXcsIFNJR05BTCh0b2dnbGVkKGJvb2wpKSwg U0xPVChzZXRFbmFibGVkKGJvb2wpKSk7Ci0gICAgCisKICAgICBRQWN0aW9uKiB0b2dnbGVSZXNp emVzVG9Db250ZW50cyA9IGdyYXBoaWNzVmlld01lbnUtPmFkZEFjdGlvbigiVG9nZ2xlIFJlc2l6 ZXMgVG8gQ29udGVudHMgTW9kZSIsIHRoaXMsIFNMT1QodG9nZ2xlUmVzaXplc1RvQ29udGVudHMo Ym9vbCkpKTsKICAgICB0b2dnbGVSZXNpemVzVG9Db250ZW50cy0+c2V0Q2hlY2thYmxlKHRydWUp OwogICAgIHRvZ2dsZVJlc2l6ZXNUb0NvbnRlbnRzLT5zZXRDaGVja2VkKGZhbHNlKTsKICAgICB0 b2dnbGVSZXNpemVzVG9Db250ZW50cy0+c2V0RW5hYmxlZChmYWxzZSk7CiAgICAgdG9nZ2xlUmVz aXplc1RvQ29udGVudHMtPmNvbm5lY3QodG9nZ2xlR3JhcGhpY3NWaWV3LCBTSUdOQUwodG9nZ2xl ZChib29sKSksIFNMT1Qoc2V0RW5hYmxlZChib29sKSkpOwotICAgIAorCiAgICAgUUFjdGlvbiog dG9nZ2xlVGlsZWRCYWNraW5nU3RvcmUgPSBncmFwaGljc1ZpZXdNZW51LT5hZGRBY3Rpb24oIlRv Z2dsZSBUaWxlZCBCYWNraW5nIFN0b3JlIiwgdGhpcywgU0xPVCh0b2dnbGVUaWxlZEJhY2tpbmdT dG9yZShib29sKSkpOwogICAgIHRvZ2dsZVRpbGVkQmFja2luZ1N0b3JlLT5zZXRDaGVja2FibGUo dHJ1ZSk7CiAgICAgdG9nZ2xlVGlsZWRCYWNraW5nU3RvcmUtPnNldENoZWNrZWQoZmFsc2UpOwpA QCAtNzQxLDYgKzc2NywxNCBAQCB2b2lkIExhdW5jaGVyV2luZG93OjpjcmVhdGVDaHJvbWUoKQog ICAgIHNwYXRpYWxOYXZpZ2F0aW9uQWN0aW9uLT5zZXRDaGVja2FibGUodHJ1ZSk7CiAgICAgc3Bh dGlhbE5hdmlnYXRpb25BY3Rpb24tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6Q1RSTCB8 IFF0OjpTSElGVCB8IFF0OjpLZXlfUykpOwogCisjaWYgIWRlZmluZWQoUV9XU19TNjApCisgICAg UUFjdGlvbiogdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQgPSBncmFwaGljc1ZpZXdNZW51LT5hZGRB Y3Rpb24oIlRvZ2dsZSB1c2Ugb2YgUUdMV2lkZ2V0IFZpZXdwb3J0IiwgdGhpcywgU0xPVCh0b2dn bGVRR0xXaWRnZXRWaWV3cG9ydChib29sKSkpOworICAgIHRvZ2dsZVFHTFdpZGdldFZpZXdwb3J0 LT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQtPnNldENo ZWNrZWQoZ1VzZVFHTFdpZGdldFZpZXdwb3J0KTsKKyAgICB0b2dnbGVRR0xXaWRnZXRWaWV3cG9y dC0+c2V0RW5hYmxlZChpc0dyYXBoaWNzQmFzZWQoKSk7CisgICAgdG9nZ2xlUUdMV2lkZ2V0Vmll d3BvcnQtPmNvbm5lY3QodG9nZ2xlR3JhcGhpY3NWaWV3LCBTSUdOQUwodG9nZ2xlZChib29sKSks IFNMT1Qoc2V0RW5hYmxlZChib29sKSkpOworI2VuZGlmCisKICAgICBncmFwaGljc1ZpZXdNZW51 LT5hZGRTZXBhcmF0b3IoKTsKIAogICAgIG1fZmxpcEFuaW1hdGVkID0gZ3JhcGhpY3NWaWV3TWVu dS0+YWRkQWN0aW9uKCJBbmltYXRlZCBGbGlwIik7Cg== 51442 2010-03-23 11:40:07 -0700 2010-03-23 13:16:20 -0700 Patch bug-36270-20100323154203.patch text/plain 5314 jesus ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkYmI0ZWY2Li41MTZhMjhkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDMt MjMgIEplc3VzIFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh biBvcHRpb24gdG8gUXRMYXVuY2hlciB0byBlbmFibGUvZGlzYWJsZSBhIFFHTFdpZGdldCBhcyBW aWV3cG9ydAorICAgICAgICBvZiB0aGUgUUdyYXBoaWNzVmlldyB3aGVuIHRoZSBsYXVuY2hlciBp cyBydW5uaW5nIG9uIGdyYXBoaWNzdmlldyBtb2RlLgorCisgICAgICAgIFtRdF0gUXRMYXVuY2hl ciBuZWVkcyBhbiBvcHRpb24gdG8gRW5hYmxlL0Rpc2FibGUgYSBRR0xXaWRnZXQgYXMgVmlld3Bv cnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2Mjcw CisKKyAgICAgICAgKiBRdExhdW5jaGVyL1F0TGF1bmNoZXIucHJvOgorICAgICAgICAqIFF0TGF1 bmNoZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6dG9nZ2xlUUdMV2lkZ2V0 Vmlld3BvcnQpOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisKIDIw MTAtMDMtMTcgIEplc3VzIFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9z c2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybyBiL1dlYktpdFRvb2xzL1F0 TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8KaW5kZXggODc5M2Q3ZS4uNDcxNDFlZiAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybworKysgYi9XZWJLaXRUb29s cy9RdExhdW5jaGVyL1F0TGF1bmNoZXIucHJvCkBAIC0yNyw3ICsyNyw3IEBAIGluY2x1ZGUoLi4v Li4vV2ViS2l0LnByaSkKIERFU1RESVIgPSAkJE9VVFBVVF9ESVIvYmluCiAKIFFUICs9IG5ldHdv cmsKLW1hY3g6UVQrPXhtbAorbWFjeDpRVCs9eG1sIG9wZW5nbAogCiBsaW51eC0qIHsKICAgICAj IEZyb20gQ3JlYXRvcidzIHNyYy9ycGF0aC5wcmk6CkBAIC0zOCw2ICszOCw4IEBAIGxpbnV4LSog ewogCiAgICAgUU1BS0VfTEZMQUdTICs9IC1XbCwteixvcmlnaW4gXCctV2wsLXJwYXRoLCQke01Z X1JQQVRIfVwnCiAgICAgUU1BS0VfUlBBVEhESVIgPQorCisgICAgUVQgKz0gb3BlbmdsCiB9IGVs c2UgewogICAgIFFNQUtFX1JQQVRIRElSID0gJCRPVVRQVVRfRElSL2xpYiAkJFFNQUtFX1JQQVRI RElSCiB9CkBAIC00NiwzICs0OCw3IEBAIHN5bWJpYW4gewogICAgIFRBUkdFVC5VSUQzID0gMHhB MDAwRTU0MwogICAgIFRBUkdFVC5DQVBBQklMSVRZID0gUmVhZFVzZXJEYXRhIFdyaXRlVXNlckRh dGEgTmV0d29ya1NlcnZpY2VzCiB9CisKK2NvbnRhaW5zKFFUX0NPTkZJRywgb3BlbmdsKSB7Cisg ICAgREVGSU5FUyArPSBRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMCit9CmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9t YWluLmNwcAppbmRleCBhZTA5ZjY1Li4zMzEyZDY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9R dExhdW5jaGVyL21haW4uY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAK QEAgLTMyLDYgKzMyLDExIEBACiAKICNpbmNsdWRlIDxRdEd1aT4KICNpbmNsdWRlIDxRdE5ldHdv cmsvUU5ldHdvcmtSZXF1ZXN0PgorCisjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BF TkdMKQorI2luY2x1ZGUgPFF0T3BlbkdML1FHTFdpZGdldD4KKyNlbmRpZgorCiAjaWYgIWRlZmlu ZWQoUVRfTk9fUFJJTlRFUikKICNpbmNsdWRlIDxRUHJpbnRQcmV2aWV3RGlhbG9nPgogI2VuZGlm CkBAIC04MCw2ICs4NSwxMCBAQCBzdGF0aWMgUVVybCBnSW5zcGVjdG9yVXJsOwogc3RhdGljIGJv b2wgZ1Jlc2l6ZXNUb0NvbnRlbnRzID0gZmFsc2U7CiBzdGF0aWMgYm9vbCBnVXNlVGlsZWRCYWNr aW5nU3RvcmUgPSBmYWxzZTsKIAorI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5H TCkKK3N0YXRpYyBib29sIGdVc2VRR0xXaWRnZXRWaWV3cG9ydCA9IGZhbHNlOworI2VuZGlmCisK IGNsYXNzIExhdW5jaGVyV2luZG93IDogcHVibGljIE1haW5XaW5kb3cgewogICAgIFFfT0JKRUNU CiAKQEAgLTEyMSw3ICsxMzAsNyBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCB0b2dnbGVB Y2NlbGVyYXRlZENvbXBvc2l0aW5nKGJvb2wgdG9nZ2xlKTsKICAgICB2b2lkIHRvZ2dsZVRpbGVk QmFja2luZ1N0b3JlKGJvb2wgdG9nZ2xlKTsKICAgICB2b2lkIHRvZ2dsZVJlc2l6ZXNUb0NvbnRl bnRzKGJvb2wgdG9nZ2xlKTsKLSAgICAKKwogICAgIHZvaWQgdG9nZ2xlV2ViR0woYm9vbCB0b2dn bGUpOwogICAgIHZvaWQgaW5pdGlhbGl6ZVZpZXcoYm9vbCB1c2VHcmFwaGljc1ZpZXcgPSBmYWxz ZSk7CiAgICAgdm9pZCB0b2dnbGVTcGF0aWFsTmF2aWdhdGlvbihib29sIGIpOwpAQCAtMTI5LDYg KzEzOCwxMCBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCBzaG93RlBTKGJvb2wgZW5hYmxl KTsKICAgICB2b2lkIGNoYW5nZVZpZXdwb3J0VXBkYXRlTW9kZShpbnQgbW9kZSk7CiAKKyNpZiBk ZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisgICAgdm9pZCB0b2dnbGVRR0xXaWRn ZXRWaWV3cG9ydChib29sIGVuYWJsZSk7CisjZW5kaWYKKwogcHVibGljIHNsb3RzOgogICAgIHZv aWQgbmV3V2luZG93KCk7CiAgICAgdm9pZCBjbG9uZVdpbmRvdygpOwpAQCAtNjIzLDYgKzYzNiwx OSBAQCB2b2lkIExhdW5jaGVyV2luZG93OjpjaGFuZ2VWaWV3cG9ydFVwZGF0ZU1vZGUoaW50IG1v ZGUpCiAgICAgdmlldy0+c2V0Vmlld3BvcnRVcGRhdGVNb2RlKGdWaWV3cG9ydFVwZGF0ZU1vZGUp OwogfQogCisjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQordm9pZCBMYXVu Y2hlcldpbmRvdzo6dG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQoYm9vbCBlbmFibGUpCit7CisgICAg aWYgKCFpc0dyYXBoaWNzQmFzZWQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZ1VzZVFHTFdp ZGdldFZpZXdwb3J0ID0gZW5hYmxlOworICAgIFdlYlZpZXdHcmFwaGljc0Jhc2VkKiB2aWV3ID0g c3RhdGljX2Nhc3Q8V2ViVmlld0dyYXBoaWNzQmFzZWQqPihtX3ZpZXcpOworCisgICAgdmlldy0+ c2V0Vmlld3BvcnQoZW5hYmxlID8gbmV3IFFHTFdpZGdldCgpIDogMCk7Cit9CisjZW5kaWYKKwog dm9pZCBMYXVuY2hlcldpbmRvdzo6bmV3V2luZG93KCkKIHsKICAgICBMYXVuY2hlcldpbmRvdyog bXcgPSBuZXcgTGF1bmNoZXJXaW5kb3codGhpcywgZmFsc2UpOwpAQCAtNzI0LDEzICs3NTAsMTMg QEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hyb21lKCkKICAgICB0b2dnbGVBY2NlbGVy YXRlZENvbXBvc2l0aW5nLT5zZXRDaGVja2VkKHNldHRpbmdzLT50ZXN0QXR0cmlidXRlKFFXZWJT ZXR0aW5nczo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQpKTsKICAgICB0b2dnbGVBY2Nl bGVyYXRlZENvbXBvc2l0aW5nLT5zZXRFbmFibGVkKGlzR3JhcGhpY3NCYXNlZCgpKTsKICAgICB0 b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nLT5jb25uZWN0KHRvZ2dsZUdyYXBoaWNzVmlldywg U0lHTkFMKHRvZ2dsZWQoYm9vbCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsKLSAgICAKKwog ICAgIFFBY3Rpb24qIHRvZ2dsZVJlc2l6ZXNUb0NvbnRlbnRzID0gZ3JhcGhpY3NWaWV3TWVudS0+ YWRkQWN0aW9uKCJUb2dnbGUgUmVzaXplcyBUbyBDb250ZW50cyBNb2RlIiwgdGhpcywgU0xPVCh0 b2dnbGVSZXNpemVzVG9Db250ZW50cyhib29sKSkpOwogICAgIHRvZ2dsZVJlc2l6ZXNUb0NvbnRl bnRzLT5zZXRDaGVja2FibGUodHJ1ZSk7CiAgICAgdG9nZ2xlUmVzaXplc1RvQ29udGVudHMtPnNl dENoZWNrZWQoZmFsc2UpOwogICAgIHRvZ2dsZVJlc2l6ZXNUb0NvbnRlbnRzLT5zZXRFbmFibGVk KGZhbHNlKTsKICAgICB0b2dnbGVSZXNpemVzVG9Db250ZW50cy0+Y29ubmVjdCh0b2dnbGVHcmFw aGljc1ZpZXcsIFNJR05BTCh0b2dnbGVkKGJvb2wpKSwgU0xPVChzZXRFbmFibGVkKGJvb2wpKSk7 Ci0gICAgCisKICAgICBRQWN0aW9uKiB0b2dnbGVUaWxlZEJhY2tpbmdTdG9yZSA9IGdyYXBoaWNz Vmlld01lbnUtPmFkZEFjdGlvbigiVG9nZ2xlIFRpbGVkIEJhY2tpbmcgU3RvcmUiLCB0aGlzLCBT TE9UKHRvZ2dsZVRpbGVkQmFja2luZ1N0b3JlKGJvb2wpKSk7CiAgICAgdG9nZ2xlVGlsZWRCYWNr aW5nU3RvcmUtPnNldENoZWNrYWJsZSh0cnVlKTsKICAgICB0b2dnbGVUaWxlZEJhY2tpbmdTdG9y ZS0+c2V0Q2hlY2tlZChmYWxzZSk7CkBAIC03NDEsNiArNzY3LDE0IEBAIHZvaWQgTGF1bmNoZXJX aW5kb3c6OmNyZWF0ZUNocm9tZSgpCiAgICAgc3BhdGlhbE5hdmlnYXRpb25BY3Rpb24tPnNldENo ZWNrYWJsZSh0cnVlKTsKICAgICBzcGF0aWFsTmF2aWdhdGlvbkFjdGlvbi0+c2V0U2hvcnRjdXQo UUtleVNlcXVlbmNlKFF0OjpDVFJMIHwgUXQ6OlNISUZUIHwgUXQ6OktleV9TKSk7CiAKKyNpZiBk ZWZpbmVkKFFUX0NPTkZJR1VSRURfV0lUSF9PUEVOR0wpCisgICAgUUFjdGlvbiogdG9nZ2xlUUdM V2lkZ2V0Vmlld3BvcnQgPSBncmFwaGljc1ZpZXdNZW51LT5hZGRBY3Rpb24oIlRvZ2dsZSB1c2Ug b2YgUUdMV2lkZ2V0IFZpZXdwb3J0IiwgdGhpcywgU0xPVCh0b2dnbGVRR0xXaWRnZXRWaWV3cG9y dChib29sKSkpOworICAgIHRvZ2dsZVFHTFdpZGdldFZpZXdwb3J0LT5zZXRDaGVja2FibGUodHJ1 ZSk7CisgICAgdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQtPnNldENoZWNrZWQoZ1VzZVFHTFdpZGdl dFZpZXdwb3J0KTsKKyAgICB0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydC0+c2V0RW5hYmxlZChpc0dy YXBoaWNzQmFzZWQoKSk7CisgICAgdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQtPmNvbm5lY3QodG9n Z2xlR3JhcGhpY3NWaWV3LCBTSUdOQUwodG9nZ2xlZChib29sKSksIFNMT1Qoc2V0RW5hYmxlZChi b29sKSkpOworI2VuZGlmCisKICAgICBncmFwaGljc1ZpZXdNZW51LT5hZGRTZXBhcmF0b3IoKTsK IAogICAgIG1fZmxpcEFuaW1hdGVkID0gZ3JhcGhpY3NWaWV3TWVudS0+YWRkQWN0aW9uKCJBbmlt YXRlZCBGbGlwIik7Cg== 51447 2010-03-23 13:16:20 -0700 2010-03-25 07:23:20 -0700 Patch QGLWidget.patch text/plain 4954 jesus ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBkYmI0ZWY2Li41MTZhMjhkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDMt MjMgIEplc3VzIFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBh biBvcHRpb24gdG8gUXRMYXVuY2hlciB0byBlbmFibGUvZGlzYWJsZSBhIFFHTFdpZGdldCBhcyBW aWV3cG9ydAorICAgICAgICBvZiB0aGUgUUdyYXBoaWNzVmlldyB3aGVuIHRoZSBsYXVuY2hlciBp cyBydW5uaW5nIG9uIGdyYXBoaWNzdmlldyBtb2RlLgorCisgICAgICAgIFtRdF0gUXRMYXVuY2hl ciBuZWVkcyBhbiBvcHRpb24gdG8gRW5hYmxlL0Rpc2FibGUgYSBRR0xXaWRnZXQgYXMgVmlld3Bv cnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2Mjcw CisKKyAgICAgICAgKiBRdExhdW5jaGVyL1F0TGF1bmNoZXIucHJvOgorICAgICAgICAqIFF0TGF1 bmNoZXIvbWFpbi5jcHA6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6dG9nZ2xlUUdMV2lkZ2V0 Vmlld3BvcnQpOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9tZSk6CisKIDIw MTAtMDMtMTcgIEplc3VzIFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9z c2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybyBiL1dlYktpdFRvb2xzL1F0 TGF1bmNoZXIvUXRMYXVuY2hlci5wcm8KaW5kZXggODc5M2Q3ZS4uNDcxNDFlZiAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9RdExhdW5jaGVyLnBybworKysgYi9XZWJLaXRUb29s cy9RdExhdW5jaGVyL1F0TGF1bmNoZXIucHJvCkBAIC00NiwzICs0Niw4IEBAIHN5bWJpYW4gewog ICAgIFRBUkdFVC5VSUQzID0gMHhBMDAwRTU0MwogICAgIFRBUkdFVC5DQVBBQklMSVRZID0gUmVh ZFVzZXJEYXRhIFdyaXRlVXNlckRhdGEgTmV0d29ya1NlcnZpY2VzCiB9CisKK2NvbnRhaW5zKFFU X0NPTkZJRywgb3BlbmdsKSB7CisgICAgUVQgKz0gb3BlbmdsCisgICAgREVGSU5FUyArPSBRVF9D T05GSUdVUkVEX1dJVEhfT1BFTkdMCit9CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdExhdW5j aGVyL21haW4uY3BwIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcAppbmRleCBhZTA5 ZjY1Li4zMzEyZDY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3Bw CisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFpbi5jcHAKQEAgLTMyLDYgKzMyLDExIEBA CiAKICNpbmNsdWRlIDxRdEd1aT4KICNpbmNsdWRlIDxRdE5ldHdvcmsvUU5ldHdvcmtSZXF1ZXN0 PgorCisjaWYgZGVmaW5lZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQorI2luY2x1ZGUgPFF0 T3BlbkdML1FHTFdpZGdldD4KKyNlbmRpZgorCiAjaWYgIWRlZmluZWQoUVRfTk9fUFJJTlRFUikK ICNpbmNsdWRlIDxRUHJpbnRQcmV2aWV3RGlhbG9nPgogI2VuZGlmCkBAIC04MCw2ICs4NSwxMCBA QCBzdGF0aWMgUVVybCBnSW5zcGVjdG9yVXJsOwogc3RhdGljIGJvb2wgZ1Jlc2l6ZXNUb0NvbnRl bnRzID0gZmFsc2U7CiBzdGF0aWMgYm9vbCBnVXNlVGlsZWRCYWNraW5nU3RvcmUgPSBmYWxzZTsK IAorI2lmIGRlZmluZWQoUVRfQ09ORklHVVJFRF9XSVRIX09QRU5HTCkKK3N0YXRpYyBib29sIGdV c2VRR0xXaWRnZXRWaWV3cG9ydCA9IGZhbHNlOworI2VuZGlmCisKIGNsYXNzIExhdW5jaGVyV2lu ZG93IDogcHVibGljIE1haW5XaW5kb3cgewogICAgIFFfT0JKRUNUCiAKQEAgLTEyMSw3ICsxMzAs NyBAQCBwcm90ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCB0b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0 aW5nKGJvb2wgdG9nZ2xlKTsKICAgICB2b2lkIHRvZ2dsZVRpbGVkQmFja2luZ1N0b3JlKGJvb2wg dG9nZ2xlKTsKICAgICB2b2lkIHRvZ2dsZVJlc2l6ZXNUb0NvbnRlbnRzKGJvb2wgdG9nZ2xlKTsK LSAgICAKKwogICAgIHZvaWQgdG9nZ2xlV2ViR0woYm9vbCB0b2dnbGUpOwogICAgIHZvaWQgaW5p dGlhbGl6ZVZpZXcoYm9vbCB1c2VHcmFwaGljc1ZpZXcgPSBmYWxzZSk7CiAgICAgdm9pZCB0b2dn bGVTcGF0aWFsTmF2aWdhdGlvbihib29sIGIpOwpAQCAtMTI5LDYgKzEzOCwxMCBAQCBwcm90ZWN0 ZWQgc2xvdHM6CiAgICAgdm9pZCBzaG93RlBTKGJvb2wgZW5hYmxlKTsKICAgICB2b2lkIGNoYW5n ZVZpZXdwb3J0VXBkYXRlTW9kZShpbnQgbW9kZSk7CiAKKyNpZiBkZWZpbmVkKFFUX0NPTkZJR1VS RURfV0lUSF9PUEVOR0wpCisgICAgdm9pZCB0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydChib29sIGVu YWJsZSk7CisjZW5kaWYKKwogcHVibGljIHNsb3RzOgogICAgIHZvaWQgbmV3V2luZG93KCk7CiAg ICAgdm9pZCBjbG9uZVdpbmRvdygpOwpAQCAtNjIzLDYgKzYzNiwxOSBAQCB2b2lkIExhdW5jaGVy V2luZG93OjpjaGFuZ2VWaWV3cG9ydFVwZGF0ZU1vZGUoaW50IG1vZGUpCiAgICAgdmlldy0+c2V0 Vmlld3BvcnRVcGRhdGVNb2RlKGdWaWV3cG9ydFVwZGF0ZU1vZGUpOwogfQogCisjaWYgZGVmaW5l ZChRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMKQordm9pZCBMYXVuY2hlcldpbmRvdzo6dG9nZ2xl UUdMV2lkZ2V0Vmlld3BvcnQoYm9vbCBlbmFibGUpCit7CisgICAgaWYgKCFpc0dyYXBoaWNzQmFz ZWQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZ1VzZVFHTFdpZGdldFZpZXdwb3J0ID0gZW5h YmxlOworICAgIFdlYlZpZXdHcmFwaGljc0Jhc2VkKiB2aWV3ID0gc3RhdGljX2Nhc3Q8V2ViVmll d0dyYXBoaWNzQmFzZWQqPihtX3ZpZXcpOworCisgICAgdmlldy0+c2V0Vmlld3BvcnQoZW5hYmxl ID8gbmV3IFFHTFdpZGdldCgpIDogMCk7Cit9CisjZW5kaWYKKwogdm9pZCBMYXVuY2hlcldpbmRv dzo6bmV3V2luZG93KCkKIHsKICAgICBMYXVuY2hlcldpbmRvdyogbXcgPSBuZXcgTGF1bmNoZXJX aW5kb3codGhpcywgZmFsc2UpOwpAQCAtNzI0LDEzICs3NTAsMTMgQEAgdm9pZCBMYXVuY2hlcldp bmRvdzo6Y3JlYXRlQ2hyb21lKCkKICAgICB0b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5nLT5z ZXRDaGVja2VkKHNldHRpbmdzLT50ZXN0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0VuYWJsZWQpKTsKICAgICB0b2dnbGVBY2NlbGVyYXRlZENvbXBvc2l0aW5n LT5zZXRFbmFibGVkKGlzR3JhcGhpY3NCYXNlZCgpKTsKICAgICB0b2dnbGVBY2NlbGVyYXRlZENv bXBvc2l0aW5nLT5jb25uZWN0KHRvZ2dsZUdyYXBoaWNzVmlldywgU0lHTkFMKHRvZ2dsZWQoYm9v bCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsKLSAgICAKKwogICAgIFFBY3Rpb24qIHRvZ2ds ZVJlc2l6ZXNUb0NvbnRlbnRzID0gZ3JhcGhpY3NWaWV3TWVudS0+YWRkQWN0aW9uKCJUb2dnbGUg UmVzaXplcyBUbyBDb250ZW50cyBNb2RlIiwgdGhpcywgU0xPVCh0b2dnbGVSZXNpemVzVG9Db250 ZW50cyhib29sKSkpOwogICAgIHRvZ2dsZVJlc2l6ZXNUb0NvbnRlbnRzLT5zZXRDaGVja2FibGUo dHJ1ZSk7CiAgICAgdG9nZ2xlUmVzaXplc1RvQ29udGVudHMtPnNldENoZWNrZWQoZmFsc2UpOwog ICAgIHRvZ2dsZVJlc2l6ZXNUb0NvbnRlbnRzLT5zZXRFbmFibGVkKGZhbHNlKTsKICAgICB0b2dn bGVSZXNpemVzVG9Db250ZW50cy0+Y29ubmVjdCh0b2dnbGVHcmFwaGljc1ZpZXcsIFNJR05BTCh0 b2dnbGVkKGJvb2wpKSwgU0xPVChzZXRFbmFibGVkKGJvb2wpKSk7Ci0gICAgCisKICAgICBRQWN0 aW9uKiB0b2dnbGVUaWxlZEJhY2tpbmdTdG9yZSA9IGdyYXBoaWNzVmlld01lbnUtPmFkZEFjdGlv bigiVG9nZ2xlIFRpbGVkIEJhY2tpbmcgU3RvcmUiLCB0aGlzLCBTTE9UKHRvZ2dsZVRpbGVkQmFj a2luZ1N0b3JlKGJvb2wpKSk7CiAgICAgdG9nZ2xlVGlsZWRCYWNraW5nU3RvcmUtPnNldENoZWNr YWJsZSh0cnVlKTsKICAgICB0b2dnbGVUaWxlZEJhY2tpbmdTdG9yZS0+c2V0Q2hlY2tlZChmYWxz ZSk7CkBAIC03NDEsNiArNzY3LDE0IEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmNyZWF0ZUNocm9t ZSgpCiAgICAgc3BhdGlhbE5hdmlnYXRpb25BY3Rpb24tPnNldENoZWNrYWJsZSh0cnVlKTsKICAg ICBzcGF0aWFsTmF2aWdhdGlvbkFjdGlvbi0+c2V0U2hvcnRjdXQoUUtleVNlcXVlbmNlKFF0OjpD VFJMIHwgUXQ6OlNISUZUIHwgUXQ6OktleV9TKSk7CiAKKyNpZiBkZWZpbmVkKFFUX0NPTkZJR1VS RURfV0lUSF9PUEVOR0wpCisgICAgUUFjdGlvbiogdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQgPSBn cmFwaGljc1ZpZXdNZW51LT5hZGRBY3Rpb24oIlRvZ2dsZSB1c2Ugb2YgUUdMV2lkZ2V0IFZpZXdw b3J0IiwgdGhpcywgU0xPVCh0b2dnbGVRR0xXaWRnZXRWaWV3cG9ydChib29sKSkpOworICAgIHRv Z2dsZVFHTFdpZGdldFZpZXdwb3J0LT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgdG9nZ2xlUUdM V2lkZ2V0Vmlld3BvcnQtPnNldENoZWNrZWQoZ1VzZVFHTFdpZGdldFZpZXdwb3J0KTsKKyAgICB0 b2dnbGVRR0xXaWRnZXRWaWV3cG9ydC0+c2V0RW5hYmxlZChpc0dyYXBoaWNzQmFzZWQoKSk7Cisg ICAgdG9nZ2xlUUdMV2lkZ2V0Vmlld3BvcnQtPmNvbm5lY3QodG9nZ2xlR3JhcGhpY3NWaWV3LCBT SUdOQUwodG9nZ2xlZChib29sKSksIFNMT1Qoc2V0RW5hYmxlZChib29sKSkpOworI2VuZGlmCisK ICAgICBncmFwaGljc1ZpZXdNZW51LT5hZGRTZXBhcmF0b3IoKTsKIAogICAgIG1fZmxpcEFuaW1h dGVkID0gZ3JhcGhpY3NWaWV3TWVudS0+YWRkQWN0aW9uKCJBbmltYXRlZCBGbGlwIik7Cg==