43168 2010-07-28 21:19:23 -0700 [Qt] QtTestBrowser not setting preferredContentsSize for resizesToContents 2010-08-03 08:20:32 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 tonikitoo tonikitoo hausmann kenneth koivisto oldest_to_newest 257534 0 tonikitoo 2010-07-28 21:19:23 -0700 Using resizesToContents is working bad in our reference/demo browser, QtTestBrowser: - we are not using this property together with setPreferredContentsSize (from QWebPage), which is explicitly adviced in our docs: http://doc.trolltech.com/4.7-snapshot/qgraphicswebview.html#resizesToContents-prop - also the default value hardcoded when no preferred contents size is set is not good. void QGraphicsWebViewPrivate::updateResizesToContentsForPage() { .. if (resizesToContents) { // resizes to contents mode requires preferred contents size to be set if (!page->preferredContentsSize().isValid()) page->setPreferredContentsSize(QSize(960, 800)); ** Also, scrolling gets broken on simple websites when we toggle it on, but it can be for another bug. 259050 1 63247 tonikitoo 2010-08-02 12:42:25 -0700 Created attachment 63247 patch v1 Patch addresses the problem for QtTestBrowser by properly handle scene, webview and viewport sizes when toggle resizesToContents on/off. 259052 2 63247 kenneth 2010-08-02 12:48:32 -0700 Comment on attachment 63247 patch v1 WebKitTools/QtTestBrowser/webview.cpp:91 + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); Strange... if it resizes to contents, no scrollbars should be shown... why are they set to as needed? 259054 3 63247 kenneth 2010-08-02 12:50:24 -0700 Comment on attachment 63247 patch v1 WebKitTools/QtTestBrowser/webview.cpp:91 + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); Strange... if it resizes to contents, no scrollbars should be shown... why are they set to as needed? WebKitTools/QtTestBrowser/webview.cpp:100 + scene()->setSceneRect(viewportRect); shouldnt these be set automatically elsewhere so they are always consistent. WebKitTools/QtTestBrowser/webview.cpp:93 + scene()->setSceneRect(QRectF()); why this? WebKitTools/QtTestBrowser/launcherwindow.cpp:409 + toggleResizesToContents(true); why not toggleResizesToContents(gResizesToContents) ? 259059 4 tonikitoo 2010-08-02 12:56:44 -0700 (In reply to comment #2) > (From update of attachment 63247 [details]) > WebKitTools/QtTestBrowser/webview.cpp:91 > + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); > Strange... if it resizes to contents, no scrollbars should be shown... why are they set to as needed? QGraphicsWebView *wont* have scrollbars as you said, but in order to make the content completely viewable (including offscreen content), the QGraphicsView still perform the scrolling, so it is set back to 'auto'. QGraphicsView's viewport is what is going to be getting scrolled instead then. > WebKitTools/QtTestBrowser/webview.cpp:100 > + scene()->setSceneRect(viewportRect); > shouldnt these be set automatically elsewhere so they are always consistent. In fact once setSceneRect(xxx) is called (see existing code in WebViewGraphicsBased::resizeEvent), scene will be sizing xxx until we call it with a invalid QRectF. > WebKitTools/QtTestBrowser/webview.cpp:93 > + scene()->setSceneRect(QRectF()); > why this? See from the docs: "The scene rectangle defines the extent of the scene. It is primarily used by QGraphicsView to determine the view's default scrollable area, and by QGraphicsScene to manage item indexing. If unset, or if set to a null QRectF, sceneRect() will return the largest bounding rect of all items on the scene since the scene was created (i.e., a rectangle that grows when items are added to or moved in the scene, but never shrinks)." 259089 5 63256 tonikitoo 2010-08-02 13:53:18 -0700 Created attachment 63256 patch v2 Same patch as attachment 63247, but with more explainations in the code, as per discussion with Kenneth on IRC. 259301 6 63304 tonikitoo 2010-08-02 23:41:30 -0700 Created attachment 63304 (committed r64556, r=kenneth) patch v2.1 - right patch [Right patch this time]. 259459 7 63304 tonikitoo 2010-08-03 08:20:07 -0700 Comment on attachment 63304 (committed r64556, r=kenneth) patch v2.1 - right patch Clearing flags on attachment: 63304 Committed r64556: <http://trac.webkit.org/changeset/64556> 63247 2010-08-02 12:42:25 -0700 2010-08-02 13:53:18 -0700 patch v1 0001-2010-08-02-Antonio-Gomes-tonikitoo-webkit.org.patch text/plain 5802 tonikitoo RnJvbSAyZGI2MjdmNzI4ZmU4YzRkZTVlYWU1OWRjZDljZDlkMDExMWMzMjZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogTW9uLCAyIEF1ZyAyMDEwIDE0OjUwOjU3IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAx MC0wOC0wMiAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgoKICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgW1F0XSBRdFRlc3RCcm93c2VyIG5v dCBzZXR0aW5nIHByZWZlcnJlZENvbnRlbnRzU2l6ZSBmb3IgcmVzaXplc1RvQ29udGVudHMKICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMxNjgKCiAgICAg ICAgUUdyYXBoaWNzV2ViVmlldyByZXNpemVzVG9Db250ZW50cyBwcm9wZXJ0eSBoYXMgdG8gd29y ayB0b2dldGhlciB3aXRoIFFXZWJQYWdlJ3MKICAgICAgICBzZXRQcmVmZXJyZWRDb250ZW50c1Np emUgYXMgc3RhdGVkIGJ5IHRoZSBkb2NzLiBQYXRjaCBhZGRyZXNzZXMgdGhhdCBmb3IgUXRUZXN0 QnJvd3Nlci4KCiAgICAgICAgKiBRdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcDoKICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMpOiBBZGRzIGNhbGxzIHNldFByZWZlcnJl ZENvbnRlbnRzLgogICAgICAgICogUXRUZXN0QnJvd3Nlci93ZWJ2aWV3Lmg6CiAgICAgICAgKFdl YlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRDdXN0b21MYXlvdXRTaXplKTogU2V0dGVyIGhlbHBlci4K ICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OmN1c3RvbUxheW91dFNpemUpOiBHZXR0ZXIg aGVscGVyLgogICAgICAgICogUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcDoKICAgICAgICAoV2Vi Vmlld0dyYXBoaWNzQmFzZWQ6OnJlc2l6ZUV2ZW50KToKICAgICAgICAoV2ViVmlld0dyYXBoaWNz QmFzZWQ6OnNldFJlc2l6ZXNUb0NvbnRlbnRzKTogUHJvcGVybHkgaGFuZGxlIHNjZW5lLCB3ZWJ2 aWV3IGFuZCB2aWV3cG9ydCBzaXplcwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBuZWVkZWQgd2hlbiB0b2dnbGUgcmVzaXplc1RvQ29udGVudHMg b24vb2ZmLgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg IHwgICAyMCArKysrKysrKysrKysrKysrKysrKwogV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9s YXVuY2hlcndpbmRvdy5jcHAgfCAgICA0ICsrKy0KIFdlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIv d2Vidmlldy5jcHAgICAgICAgIHwgICAyMSArKysrKysrKysrKysrKysrKystLS0KIFdlYktpdFRv b2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5oICAgICAgICAgIHwgICAgMyArKysKIDQgZmlsZXMg Y2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXggZGQ5YzZl ZC4uYmQ0YjdkMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktp dFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEwLTA4LTAyICBBbnRvbmlvIEdv bWVzICA8dG9uaWtpdG9vQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW1F0XSBRdFRlc3RCcm93c2VyIG5vdCBzZXR0aW5nIHByZWZl cnJlZENvbnRlbnRzU2l6ZSBmb3IgcmVzaXplc1RvQ29udGVudHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMTY4CisKKyAgICAgICAgUUdyYXBoaWNz V2ViVmlldyByZXNpemVzVG9Db250ZW50cyBwcm9wZXJ0eSBoYXMgdG8gd29yayB0b2dldGhlciB3 aXRoIFFXZWJQYWdlJ3MKKyAgICAgICAgc2V0UHJlZmVycmVkQ29udGVudHNTaXplIGFzIHN0YXRl ZCBieSB0aGUgZG9jcy4gUGF0Y2ggYWRkcmVzc2VzIHRoYXQgZm9yIFF0VGVzdEJyb3dzZXIuCisK KyAgICAgICAgKiBRdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcDoKKyAgICAgICAgKExh dW5jaGVyV2luZG93OjphcHBseVByZWZzKTogQWRkcyBjYWxscyBzZXRQcmVmZXJyZWRDb250ZW50 cy4KKyAgICAgICAgKiBRdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwOgorICAgICAgICAoV2ViVmll d0dyYXBoaWNzQmFzZWQ6OnNldFJlc2l6ZXNUb0NvbnRlbnRzKTogUHJvcGVybHkgaGFuZGxlIHNj ZW5lLCB3ZWJ2aWV3IGFuZCB2aWV3cG9ydCBzaXplcworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmVlZGVkIHdoZW4gdG9nZ2xlIHJlc2l6ZXNU b0NvbnRlbnRzIG9uL29mZi4KKyAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpyZXNpemVF dmVudCk6CisgICAgICAgICogUXRUZXN0QnJvd3Nlci93ZWJ2aWV3Lmg6CisgICAgICAgIChXZWJW aWV3R3JhcGhpY3NCYXNlZDo6c2V0Q3VzdG9tTGF5b3V0U2l6ZSk6IFNldHRlciBoZWxwZXIuCisg ICAgICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6Y3VzdG9tTGF5b3V0U2l6ZSk6IEdldHRlciBo ZWxwZXIuCisKIDIwMTAtMDgtMDIgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwIGIvV2ViS2l0VG9vbHMvUXRU ZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKaW5kZXggMTc3YWRlYS4uMjNmMzU1NCAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKKysr IGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAKQEAgLTQwMiw5 ICs0MDIsMTEgQEAgdm9pZCBMYXVuY2hlcldpbmRvdzo6YXBwbHlQcmVmcyhMYXVuY2hlcldpbmRv dyogc291cmNlKQogICAgIGlmIChvdGhlclZpZXcpIHsKICAgICAgICAgdmlldy0+c2V0SXRlbUNh Y2hlTW9kZShvdGhlclZpZXctPml0ZW1DYWNoZU1vZGUoKSk7CiAgICAgICAgIHZpZXctPnNldFJl c2l6ZXNUb0NvbnRlbnRzKG90aGVyVmlldy0+cmVzaXplc1RvQ29udGVudHMoKSk7CisgICAgICAg IHZpZXctPnNldEN1c3RvbUxheW91dFNpemUob3RoZXJWaWV3LT5jdXN0b21MYXlvdXRTaXplKCkp OwogICAgIH0gZWxzZSB7CiAgICAgICAgIHZpZXctPnNldEl0ZW1DYWNoZU1vZGUoZ0NhY2hlV2Vi VmlldyA/IFFHcmFwaGljc0l0ZW06OkRldmljZUNvb3JkaW5hdGVDYWNoZSA6IFFHcmFwaGljc0l0 ZW06Ok5vQ2FjaGUpOwotICAgICAgICB2aWV3LT5zZXRSZXNpemVzVG9Db250ZW50cyhnUmVzaXpl c1RvQ29udGVudHMpOworICAgICAgICBpZiAoZ1Jlc2l6ZXNUb0NvbnRlbnRzKQorICAgICAgICAg ICAgdG9nZ2xlUmVzaXplc1RvQ29udGVudHModHJ1ZSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwIGIvV2ViS2l0VG9vbHMvUXRU ZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcAppbmRleCBkMDY0OTNlLi40MGFhN2VhIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwCisrKyBiL1dlYktpdFRvb2xz L1F0VGVzdEJyb3dzZXIvd2Vidmlldy5jcHAKQEAgLTgxLDI1ICs4MSw0MCBAQCBXZWJWaWV3R3Jh cGhpY3NCYXNlZDo6V2ViVmlld0dyYXBoaWNzQmFzZWQoUVdpZGdldCogcGFyZW50KQogCiB2b2lk IFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRSZXNpemVzVG9Db250ZW50cyhib29sIGIpCiB7Cisg ICAgaWYgKGIgPT0gbV9yZXNpemVzVG9Db250ZW50cykKKyAgICAgICAgcmV0dXJuOworCiAgICAg bV9yZXNpemVzVG9Db250ZW50cyA9IGI7CiAgICAgbV9pdGVtLT5zZXRSZXNpemVzVG9Db250ZW50 cyhtX3Jlc2l6ZXNUb0NvbnRlbnRzKTsKICAgICBpZiAobV9yZXNpemVzVG9Db250ZW50cykgewog ICAgICAgICBzZXRIb3Jpem9udGFsU2Nyb2xsQmFyUG9saWN5KFF0OjpTY3JvbGxCYXJBc05lZWRl ZCk7CiAgICAgICAgIHNldFZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5KFF0OjpTY3JvbGxCYXJBc05l ZWRlZCk7CisgICAgICAgIG1faXRlbS0+cGFnZSgpLT5zZXRQcmVmZXJyZWRDb250ZW50c1NpemUo c2l6ZSgpKTsKKyAgICAgICAgc2NlbmUoKS0+c2V0U2NlbmVSZWN0KFFSZWN0RigpKTsKICAgICB9 IGVsc2UgewogICAgICAgICBzZXRIb3Jpem9udGFsU2Nyb2xsQmFyUG9saWN5KFF0OjpTY3JvbGxC YXJBbHdheXNPZmYpOwogICAgICAgICBzZXRWZXJ0aWNhbFNjcm9sbEJhclBvbGljeShRdDo6U2Ny b2xsQmFyQWx3YXlzT2ZmKTsKKyAgICAgICAgbV9pdGVtLT5wYWdlKCktPnNldFByZWZlcnJlZENv bnRlbnRzU2l6ZShRU2l6ZSgpKTsKKyAgICAgICAgUVJlY3Qgdmlld3BvcnRSZWN0KFFQb2ludCgw LCAwKSwgc2l6ZSgpKTsKKyAgICAgICAgbV9pdGVtLT5zZXRHZW9tZXRyeSh2aWV3cG9ydFJlY3Qp OworICAgICAgICBzY2VuZSgpLT5zZXRTY2VuZVJlY3Qodmlld3BvcnRSZWN0KTsKICAgICB9CiB9 CiAKIHZvaWQgV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnJlc2l6ZUV2ZW50KFFSZXNpemVFdmVudCog ZXZlbnQpCiB7CiAgICAgUUdyYXBoaWNzVmlldzo6cmVzaXplRXZlbnQoZXZlbnQpOwotICAgIGlm IChtX3Jlc2l6ZXNUb0NvbnRlbnRzKQorCisgICAgUVNpemUgc2l6ZShldmVudC0+c2l6ZSgpKTsK KyAgICBRUmVjdEYgcmVjdChRUG9pbnQoMCwgMCksIHNpemUpOworCisgICAgaWYgKG1fcmVzaXpl c1RvQ29udGVudHMpIHsKKyAgICAgICAgbV9pdGVtLT5wYWdlKCktPnNldFByZWZlcnJlZENvbnRl bnRzU2l6ZShzaXplKTsKICAgICAgICAgcmV0dXJuOwotICAgIFFSZWN0RiByZWN0KFFQb2ludCgw LCAwKSwgZXZlbnQtPnNpemUoKSk7Ci0gICAgbV9pdGVtLT5zZXRHZW9tZXRyeShyZWN0KTsKKyAg ICB9CisKICAgICBzY2VuZSgpLT5zZXRTY2VuZVJlY3QocmVjdCk7CisgICAgbV9pdGVtLT5zZXRH ZW9tZXRyeShyZWN0KTsKIH0KIAogdm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0RnJhbWVS YXRlTWVhc3VyZW1lbnRFbmFibGVkKGJvb2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5oIGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93 ZWJ2aWV3LmgKaW5kZXggOWI1MzNiMy4uNDMzODQ0YyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv UXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmgKKysrIGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93 ZWJ2aWV3LmgKQEAgLTg0LDYgKzg0LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0UmVzaXplc1Rv Q29udGVudHMoYm9vbCBiKTsKICAgICBib29sIHJlc2l6ZXNUb0NvbnRlbnRzKCkgY29uc3QgeyBy ZXR1cm4gbV9yZXNpemVzVG9Db250ZW50czsgfQogCisgICAgdm9pZCBzZXRDdXN0b21MYXlvdXRT aXplKGNvbnN0IFFTaXplJiBzaXplKSB7IHJldHVybiBtX2l0ZW0tPnBhZ2UoKS0+c2V0UHJlZmVy cmVkQ29udGVudHNTaXplKHNpemUpOyB9CisgICAgUVNpemUgY3VzdG9tTGF5b3V0U2l6ZSgpIGNv bnN0IHsgcmV0dXJuIG1faXRlbS0+cGFnZSgpLT5wcmVmZXJyZWRDb250ZW50c1NpemUoKTsgfQor CiAgICAgdm9pZCBzZXRZUm90YXRpb24ocXJlYWwgYW5nbGUpCiAgICAgewogI2lmIFFUX1ZFUlNJ T04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQotLSAKMS43LjAuNAoK 63256 2010-08-02 13:53:18 -0700 2010-08-02 23:41:30 -0700 patch v2 0001-2010-08-02-Antonio-Gomes-tonikitoo-webkit.org.patch text/plain 6576 tonikitoo RnJvbSA3OTI5YTRhMGQ0YzEzZDUzYTEzNjliNDUzZGNkOTEzYWNhZmQxZTA1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogTW9uLCAyIEF1ZyAyMDEwIDE0OjUwOjU3IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAx MC0wOC0wMiAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgoKICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgW1F0XSBRdFRlc3RCcm93c2VyIG5v dCBzZXR0aW5nIHByZWZlcnJlZENvbnRlbnRzU2l6ZSBmb3IgcmVzaXplc1RvQ29udGVudHMKICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMxNjgKCiAgICAg ICAgUUdyYXBoaWNzV2ViVmlldyByZXNpemVzVG9Db250ZW50cyBwcm9wZXJ0eSBoYXMgdG8gd29y ayB0b2dldGhlciB3aXRoIFFXZWJQYWdlJ3MKICAgICAgICBzZXRQcmVmZXJyZWRDb250ZW50c1Np emUgYXMgc3RhdGVkIGJ5IHRoZSBkb2NzLiBQYXRjaCBhZGRyZXNzZXMgdGhhdCBmb3IgUXRUZXN0 QnJvd3Nlci4KCiAgICAgICAgKiBRdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcDoKICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMpOiBBZGRzIGNhbGxzIHNldFByZWZlcnJl ZENvbnRlbnRzLgogICAgICAgICogUXRUZXN0QnJvd3Nlci93ZWJ2aWV3Lmg6CiAgICAgICAgKFdl YlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRDdXN0b21MYXlvdXRTaXplKTogU2V0dGVyIGhlbHBlci4K ICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OmN1c3RvbUxheW91dFNpemUpOiBHZXR0ZXIg aGVscGVyLgogICAgICAgICogUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcDoKICAgICAgICAoV2Vi Vmlld0dyYXBoaWNzQmFzZWQ6OnJlc2l6ZUV2ZW50KToKICAgICAgICAoV2ViVmlld0dyYXBoaWNz QmFzZWQ6OnNldFJlc2l6ZXNUb0NvbnRlbnRzKTogUHJvcGVybHkgaGFuZGxlIHNjZW5lLCB3ZWJ2 aWV3IGFuZCB2aWV3cG9ydCBzaXplcwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBuZWVkZWQgd2hlbiB0b2dnbGUgcmVzaXplc1RvQ29udGVudHMg b24vb2ZmLgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg IHwgICAyMCArKysrKysrKysrKysrKysrCiBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL2xhdW5j aGVyd2luZG93LmNwcCB8ICAgIDQgKystCiBXZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3dlYnZp ZXcuY3BwICAgICAgICB8ICAgMzIgKysrKysrKysrKysrKysrKysrKysrKystLQogV2ViS2l0VG9v bHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmggICAgICAgICAgfCAgICAzICsrCiA0IGZpbGVzIGNo YW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGRkOWM2ZWQu LmJkNGI3ZDAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOC0wMiAgQW50b25pbyBHb21l cyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtRdF0gUXRUZXN0QnJvd3NlciBub3Qgc2V0dGluZyBwcmVmZXJy ZWRDb250ZW50c1NpemUgZm9yIHJlc2l6ZXNUb0NvbnRlbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzE2OAorCisgICAgICAgIFFHcmFwaGljc1dl YlZpZXcgcmVzaXplc1RvQ29udGVudHMgcHJvcGVydHkgaGFzIHRvIHdvcmsgdG9nZXRoZXIgd2l0 aCBRV2ViUGFnZSdzCisgICAgICAgIHNldFByZWZlcnJlZENvbnRlbnRzU2l6ZSBhcyBzdGF0ZWQg YnkgdGhlIGRvY3MuIFBhdGNoIGFkZHJlc3NlcyB0aGF0IGZvciBRdFRlc3RCcm93c2VyLgorCisg ICAgICAgICogUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHA6CisgICAgICAgIChMYXVu Y2hlcldpbmRvdzo6YXBwbHlQcmVmcyk6IEFkZHMgY2FsbHMgc2V0UHJlZmVycmVkQ29udGVudHMu CisgICAgICAgICogUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXdH cmFwaGljc0Jhc2VkOjpzZXRSZXNpemVzVG9Db250ZW50cyk6IFByb3Blcmx5IGhhbmRsZSBzY2Vu ZSwgd2VidmlldyBhbmQgdmlld3BvcnQgc2l6ZXMKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5lZWRlZCB3aGVuIHRvZ2dsZSByZXNpemVzVG9D b250ZW50cyBvbi9vZmYuCisgICAgICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6cmVzaXplRXZl bnQpOgorICAgICAgICAqIFF0VGVzdEJyb3dzZXIvd2Vidmlldy5oOgorICAgICAgICAoV2ViVmll d0dyYXBoaWNzQmFzZWQ6OnNldEN1c3RvbUxheW91dFNpemUpOiBTZXR0ZXIgaGVscGVyLgorICAg ICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OmN1c3RvbUxheW91dFNpemUpOiBHZXR0ZXIgaGVs cGVyLgorCiAyMDEwLTA4LTAyICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9RdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcCBiL1dlYktpdFRvb2xzL1F0VGVz dEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCmluZGV4IDE3N2FkZWEuLjIzZjM1NTQgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCisrKyBi L1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCkBAIC00MDIsOSAr NDAyLDExIEBAIHZvaWQgTGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMoTGF1bmNoZXJXaW5kb3cq IHNvdXJjZSkKICAgICBpZiAob3RoZXJWaWV3KSB7CiAgICAgICAgIHZpZXctPnNldEl0ZW1DYWNo ZU1vZGUob3RoZXJWaWV3LT5pdGVtQ2FjaGVNb2RlKCkpOwogICAgICAgICB2aWV3LT5zZXRSZXNp emVzVG9Db250ZW50cyhvdGhlclZpZXctPnJlc2l6ZXNUb0NvbnRlbnRzKCkpOworICAgICAgICB2 aWV3LT5zZXRDdXN0b21MYXlvdXRTaXplKG90aGVyVmlldy0+Y3VzdG9tTGF5b3V0U2l6ZSgpKTsK ICAgICB9IGVsc2UgewogICAgICAgICB2aWV3LT5zZXRJdGVtQ2FjaGVNb2RlKGdDYWNoZVdlYlZp ZXcgPyBRR3JhcGhpY3NJdGVtOjpEZXZpY2VDb29yZGluYXRlQ2FjaGUgOiBRR3JhcGhpY3NJdGVt OjpOb0NhY2hlKTsKLSAgICAgICAgdmlldy0+c2V0UmVzaXplc1RvQ29udGVudHMoZ1Jlc2l6ZXNU b0NvbnRlbnRzKTsKKyAgICAgICAgaWYgKGdSZXNpemVzVG9Db250ZW50cykKKyAgICAgICAgICAg IHRvZ2dsZVJlc2l6ZXNUb0NvbnRlbnRzKHRydWUpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcCBiL1dlYktpdFRvb2xzL1F0VGVz dEJyb3dzZXIvd2Vidmlldy5jcHAKaW5kZXggZDA2NDkzZS4uMmNlZjMxYyAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXRUb29scy9R dFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwCkBAIC04MSwyNSArODEsNTEgQEAgV2ViVmlld0dyYXBo aWNzQmFzZWQ6OldlYlZpZXdHcmFwaGljc0Jhc2VkKFFXaWRnZXQqIHBhcmVudCkKIAogdm9pZCBX ZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0UmVzaXplc1RvQ29udGVudHMoYm9vbCBiKQogeworICAg IGlmIChiID09IG1fcmVzaXplc1RvQ29udGVudHMpCisgICAgICAgIHJldHVybjsKKwogICAgIG1f cmVzaXplc1RvQ29udGVudHMgPSBiOwogICAgIG1faXRlbS0+c2V0UmVzaXplc1RvQ29udGVudHMo bV9yZXNpemVzVG9Db250ZW50cyk7CisKKyAgICAvLyBXaGVuIHNldHRpbmcgcmVzaXplc1RvQ29u dGVudHMgT04sIG91ciB3ZWIgdmlldyB3aWRnZXQgd2lsbCBhbHdheXMgc2l6ZSBhcyBiaWcgYXMg dGhlCisgICAgLy8gd2ViIGNvbnRlbnQgYmVpbmcgZGlzcGxheWVkLCBhbmQgc28gd2lsbCB0aGUg UVdlYlBhZ2UncyB2aWV3cG9ydC4gSXQgaW1wbGljYXRlcyB0aGF0IGludGVybmFsbHkKKyAgICAv LyBXZWJDb3JlIHdpbGwgd29yayBhcyBpZiB0aGVyZSBpcyBubyBjb250ZW50IHJlbmRlcmVkIG9m ZnNjcmVlbiwgYW5kIHRoZW4gbm8gc2Nyb2xsYmFycyBuZWVkZWQuCisgICAgLy8gSW4gb3JkZXIg dG8ga2VlcCBzY3JvbGxpbmcgd29ya2luZywgd2Ugc2V0IFFHcmFwaGljc1ZpZXcncyBzY3JvbGxi YXJzIHBvbGljeSBiYWNrIHRvIGF1dG8uCiAgICAgaWYgKG1fcmVzaXplc1RvQ29udGVudHMpIHsK ICAgICAgICAgc2V0SG9yaXpvbnRhbFNjcm9sbEJhclBvbGljeShRdDo6U2Nyb2xsQmFyQXNOZWVk ZWQpOwogICAgICAgICBzZXRWZXJ0aWNhbFNjcm9sbEJhclBvbGljeShRdDo6U2Nyb2xsQmFyQXNO ZWVkZWQpOworCisgICAgICAgIC8vIFNldCBwcmVmZXJyZWRDb250ZW50c1NpemUgdG8gdGhlIG9m IFFHcmFwaGljc1ZpZXcgdmlld3BvcnQsIHNvIFdlYkNvcmUgcHJvcGVybHkgbGF5cyBwYWdlcyBv dXQuCisgICAgICAgIG1faXRlbS0+cGFnZSgpLT5zZXRQcmVmZXJyZWRDb250ZW50c1NpemUoc2l6 ZSgpKTsKKworICAgICAgICAvLyBRR3JhcGhpY3NWaWV3IGFsc28gY2FsY3VsYXRlcyB0aGUgc2l6 ZSBvZiBpdHMgc2Nyb2xsYWJsZSBhcmVhIGFjY29yZGluZyB0byB0aGUgYW1vdW50IG9mCisgICAg ICAgIC8vIGNvbnRlbnQgaW4gc2NlbmUgdGhhdCBpcyByZW5kZXJlZCBvZmZzY3JlZW4uIFNldHRp bmcgc2NlbmUncyBib3VuZGFyaWVzIHRvIGFuIGludmFsaWQgc2l6ZSwKKyAgICAgICAgLy8gbWFr ZXMgc28gdGhhdCBpdCBlbmNsb3NlcyBhbGwgaXRlbXMgb250byBpdC4KKyAgICAgICAgc2NlbmUo KS0+c2V0U2NlbmVSZWN0KFFSZWN0RigpKTsKICAgICB9IGVsc2UgewogICAgICAgICBzZXRIb3Jp em9udGFsU2Nyb2xsQmFyUG9saWN5KFF0OjpTY3JvbGxCYXJBbHdheXNPZmYpOwogICAgICAgICBz ZXRWZXJ0aWNhbFNjcm9sbEJhclBvbGljeShRdDo6U2Nyb2xsQmFyQWx3YXlzT2ZmKTsKKyAgICAg ICAgbV9pdGVtLT5wYWdlKCktPnNldFByZWZlcnJlZENvbnRlbnRzU2l6ZShRU2l6ZSgpKTsKKyAg ICAgICAgUVJlY3Qgdmlld3BvcnRSZWN0KFFQb2ludCgwLCAwKSwgc2l6ZSgpKTsKKyAgICAgICAg bV9pdGVtLT5zZXRHZW9tZXRyeSh2aWV3cG9ydFJlY3QpOworICAgICAgICBzY2VuZSgpLT5zZXRT Y2VuZVJlY3Qodmlld3BvcnRSZWN0KTsKICAgICB9CiB9CiAKIHZvaWQgV2ViVmlld0dyYXBoaWNz QmFzZWQ6OnJlc2l6ZUV2ZW50KFFSZXNpemVFdmVudCogZXZlbnQpCiB7CiAgICAgUUdyYXBoaWNz Vmlldzo6cmVzaXplRXZlbnQoZXZlbnQpOwotICAgIGlmIChtX3Jlc2l6ZXNUb0NvbnRlbnRzKQor CisgICAgUVNpemUgc2l6ZShldmVudC0+c2l6ZSgpKTsKKyAgICBRUmVjdEYgcmVjdChRUG9pbnQo MCwgMCksIHNpemUpOworCisgICAgaWYgKG1fcmVzaXplc1RvQ29udGVudHMpIHsKKyAgICAgICAg bV9pdGVtLT5wYWdlKCktPnNldFByZWZlcnJlZENvbnRlbnRzU2l6ZShzaXplKTsKICAgICAgICAg cmV0dXJuOwotICAgIFFSZWN0RiByZWN0KFFQb2ludCgwLCAwKSwgZXZlbnQtPnNpemUoKSk7Ci0g ICAgbV9pdGVtLT5zZXRHZW9tZXRyeShyZWN0KTsKKyAgICB9CisKICAgICBzY2VuZSgpLT5zZXRT Y2VuZVJlY3QocmVjdCk7CisgICAgbV9pdGVtLT5zZXRHZW9tZXRyeShyZWN0KTsKIH0KIAogdm9p ZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0RnJhbWVSYXRlTWVhc3VyZW1lbnRFbmFibGVkKGJv b2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmll dy5oIGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmgKaW5kZXggOWI1MzNiMy4u NDMzODQ0YyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmgK KysrIGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmgKQEAgLTg0LDYgKzg0LDkg QEAgcHVibGljOgogICAgIHZvaWQgc2V0UmVzaXplc1RvQ29udGVudHMoYm9vbCBiKTsKICAgICBi b29sIHJlc2l6ZXNUb0NvbnRlbnRzKCkgY29uc3QgeyByZXR1cm4gbV9yZXNpemVzVG9Db250ZW50 czsgfQogCisgICAgdm9pZCBzZXRDdXN0b21MYXlvdXRTaXplKGNvbnN0IFFTaXplJiBzaXplKSB7 IHJldHVybiBtX2l0ZW0tPnBhZ2UoKS0+c2V0UHJlZmVycmVkQ29udGVudHNTaXplKHNpemUpOyB9 CisgICAgUVNpemUgY3VzdG9tTGF5b3V0U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1faXRlbS0+cGFn ZSgpLT5wcmVmZXJyZWRDb250ZW50c1NpemUoKTsgfQorCiAgICAgdm9pZCBzZXRZUm90YXRpb24o cXJlYWwgYW5nbGUpCiAgICAgewogI2lmIFFUX1ZFUlNJT04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0 LCA2LCAwKQotLSAKMS43LjAuNAoK 63304 2010-08-02 23:41:30 -0700 2010-08-03 08:20:07 -0700 (committed r64556, r=kenneth) patch v2.1 - right patch 0001-2010-08-02-Antonio-Gomes-tonikitoo-webkit.org.patch text/plain 6648 tonikitoo RnJvbSBhNjc0ZmVjYzVhZTYxMjE5NDNjNGU1ZTE4YTQzM2Y1ZmUzOTVlMjIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogTW9uLCAyIEF1ZyAyMDEwIDE0OjUwOjU3IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gMjAx MC0wOC0wMiAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgoKICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgW1F0XSBRdFRlc3RCcm93c2VyIG5v dCBzZXR0aW5nIHByZWZlcnJlZENvbnRlbnRzU2l6ZSBmb3IgcmVzaXplc1RvQ29udGVudHMKICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMxNjgKCiAgICAg ICAgUUdyYXBoaWNzV2ViVmlldyByZXNpemVzVG9Db250ZW50cyBwcm9wZXJ0eSBoYXMgdG8gd29y ayB0b2dldGhlciB3aXRoIFFXZWJQYWdlJ3MKICAgICAgICBzZXRQcmVmZXJyZWRDb250ZW50c1Np emUgYXMgc3RhdGVkIGJ5IHRoZSBkb2NzLiBQYXRjaCBhZGRyZXNzZXMgdGhhdCBmb3IgUXRUZXN0 QnJvd3Nlci4KCiAgICAgICAgKiBRdFRlc3RCcm93c2VyL2xhdW5jaGVyd2luZG93LmNwcDoKICAg ICAgICAoTGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMpOgogICAgICAgICogUXRUZXN0QnJvd3Nl ci93ZWJ2aWV3Lmg6CiAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRDdXN0b21MYXlv dXRTaXplKTogU2V0dGVyIGhlbHBlci4KICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OmN1 c3RvbUxheW91dFNpemUpOiBHZXR0ZXIgaGVscGVyLgogICAgICAgICogUXRUZXN0QnJvd3Nlci93 ZWJ2aWV3LmNwcDoKICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnJlc2l6ZUV2ZW50KToK ICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnNldFJlc2l6ZXNUb0NvbnRlbnRzKTogUHJv cGVybHkgaGFuZGxlIHNjZW5lLCB3ZWJ2aWV3IGFuZCB2aWV3cG9ydCBzaXplcwogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuZWVkZWQgd2hlbiB0 b2dnbGUgcmVzaXplc1RvQ29udGVudHMgb24vb2ZmLgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxv ZyAgICAgICAgICAgICAgICAgICAgICAgIHwgICAyMCArKysrKysrKysrKysrKwogV2ViS2l0VG9v bHMvUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRvdy5jcHAgfCAgICAzICstCiBXZWJLaXRUb29s cy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwICAgICAgICB8ICAgMzUgKysrKysrKysrKysrKysr KysrKysrKysrLQogV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmggICAgICAgICAg fCAgICAzICsrCiA0IGZpbGVzIGNoYW5nZWQsIDU4IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCmluZGV4IGRkOWM2ZWQuLjE5ZWE5YWEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0No YW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAx MC0wOC0wMiAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUXRUZXN0QnJvd3Nl ciBub3Qgc2V0dGluZyBwcmVmZXJyZWRDb250ZW50c1NpemUgZm9yIHJlc2l6ZXNUb0NvbnRlbnRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzE2OAor CisgICAgICAgIFFHcmFwaGljc1dlYlZpZXcgcmVzaXplc1RvQ29udGVudHMgcHJvcGVydHkgaGFz IHRvIHdvcmsgdG9nZXRoZXIgd2l0aCBRV2ViUGFnZSdzCisgICAgICAgIHNldFByZWZlcnJlZENv bnRlbnRzU2l6ZSBhcyBzdGF0ZWQgYnkgdGhlIGRvY3MuIFBhdGNoIGFkZHJlc3NlcyB0aGF0IGZv ciBRdFRlc3RCcm93c2VyLgorCisgICAgICAgICogUXRUZXN0QnJvd3Nlci9sYXVuY2hlcndpbmRv dy5jcHA6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6YXBwbHlQcmVmcyk6CisgICAgICAgICog UXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2Vk OjpzZXRSZXNpemVzVG9Db250ZW50cyk6IFByb3Blcmx5IGhhbmRsZSBzY2VuZSwgd2VidmlldyBh bmQgdmlld3BvcnQgc2l6ZXMKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG5lZWRlZCB3aGVuIHRvZ2dsZSByZXNpemVzVG9Db250ZW50cyBvbi9v ZmYuCisgICAgICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6cmVzaXplRXZlbnQpOgorICAgICAg ICAqIFF0VGVzdEJyb3dzZXIvd2Vidmlldy5oOgorICAgICAgICAoV2ViVmlld0dyYXBoaWNzQmFz ZWQ6OnNldEN1c3RvbUxheW91dFNpemUpOiBTZXR0ZXIgaGVscGVyLgorICAgICAgICAoV2ViVmll d0dyYXBoaWNzQmFzZWQ6OmN1c3RvbUxheW91dFNpemUpOiBHZXR0ZXIgaGVscGVyLgorCiAyMDEw LTA4LTAyICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9RdFRlc3RC cm93c2VyL2xhdW5jaGVyd2luZG93LmNwcCBiL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1 bmNoZXJ3aW5kb3cuY3BwCmluZGV4IDE3N2FkZWEuLjNlYmM2YzkgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCisrKyBiL1dlYktpdFRvb2xz L1F0VGVzdEJyb3dzZXIvbGF1bmNoZXJ3aW5kb3cuY3BwCkBAIC00MDIsOSArNDAyLDEwIEBAIHZv aWQgTGF1bmNoZXJXaW5kb3c6OmFwcGx5UHJlZnMoTGF1bmNoZXJXaW5kb3cqIHNvdXJjZSkKICAg ICBpZiAob3RoZXJWaWV3KSB7CiAgICAgICAgIHZpZXctPnNldEl0ZW1DYWNoZU1vZGUob3RoZXJW aWV3LT5pdGVtQ2FjaGVNb2RlKCkpOwogICAgICAgICB2aWV3LT5zZXRSZXNpemVzVG9Db250ZW50 cyhvdGhlclZpZXctPnJlc2l6ZXNUb0NvbnRlbnRzKCkpOworICAgICAgICB2aWV3LT5zZXRDdXN0 b21MYXlvdXRTaXplKG90aGVyVmlldy0+Y3VzdG9tTGF5b3V0U2l6ZSgpKTsKICAgICB9IGVsc2Ug ewogICAgICAgICB2aWV3LT5zZXRJdGVtQ2FjaGVNb2RlKGdDYWNoZVdlYlZpZXcgPyBRR3JhcGhp Y3NJdGVtOjpEZXZpY2VDb29yZGluYXRlQ2FjaGUgOiBRR3JhcGhpY3NJdGVtOjpOb0NhY2hlKTsK LSAgICAgICAgdmlldy0+c2V0UmVzaXplc1RvQ29udGVudHMoZ1Jlc2l6ZXNUb0NvbnRlbnRzKTsK KyAgICAgICAgdG9nZ2xlUmVzaXplc1RvQ29udGVudHMoZ1Jlc2l6ZXNUb0NvbnRlbnRzKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5j cHAgYi9XZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3dlYnZpZXcuY3BwCmluZGV4IGQwNjQ5M2Uu LmU0NTZmOTAgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0VGVzdEJyb3dzZXIvd2Vidmlldy5j cHAKKysrIGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmNwcApAQCAtODEsMjMg KzgxLDU0IEBAIFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpXZWJWaWV3R3JhcGhpY3NCYXNlZChRV2lk Z2V0KiBwYXJlbnQpCiAKIHZvaWQgV2ViVmlld0dyYXBoaWNzQmFzZWQ6OnNldFJlc2l6ZXNUb0Nv bnRlbnRzKGJvb2wgYikKIHsKKyAgICBpZiAoYiA9PSBtX3Jlc2l6ZXNUb0NvbnRlbnRzKQorICAg ICAgICByZXR1cm47CisKICAgICBtX3Jlc2l6ZXNUb0NvbnRlbnRzID0gYjsKICAgICBtX2l0ZW0t PnNldFJlc2l6ZXNUb0NvbnRlbnRzKG1fcmVzaXplc1RvQ29udGVudHMpOworCisgICAgLy8gV2hl biBzZXR0aW5nIHJlc2l6ZXNUb0NvbnRlbnRzIE9OLCBvdXIgd2ViIHZpZXcgd2lkZ2V0IHdpbGwg YWx3YXlzIHNpemUgYXMgYmlnIGFzIHRoZQorICAgIC8vIHdlYiBjb250ZW50IGJlaW5nIGRpc3Bs YXllZCwgYW5kIHNvIHdpbGwgdGhlIFFXZWJQYWdlJ3Mgdmlld3BvcnQuIEl0IGltcGxpZXMgdGhh dCBpbnRlcm5hbGx5CisgICAgLy8gV2ViQ29yZSB3aWxsIHdvcmsgYXMgaWYgdGhlcmUgd2FzIG5v IGNvbnRlbnQgcmVuZGVyZWQgb2Zmc2NyZWVuLCBhbmQgdGhlbiBubyBzY3JvbGxiYXJzIG5lZWQK KyAgICAvLyBkcmF3aW5nLiBJbiBvcmRlciB0byBrZWVwIHNjcm9sbGluZyB3b3JraW5nLCB3ZToK KyAgICAvLworICAgIC8vIDEpIFNldCBRR3JhcGhpY3NWaWV3J3Mgc2Nyb2xsYmFycyBwb2xpY3kg YmFjayB0byAnYXV0bycuCisgICAgLy8gMikgU2V0IHNjZW5lJ3MgYm91bmRhcmllcyByZWN0IHRv IGFuIGludmFsaWQgc2l6ZSwgd2hpY2ggYXV0b21hdGljYWxseSBtYWtlcyBpdCB0byBiZSBhcyBi aWcKKyAgICAvLyAgICBhcyBpdCBuZWVkcyB0byBlbmNsb3NlIGFsbCBpdGVtcyBvbnRvIGl0LiBX ZSBkbyB0aGF0IGJlY2F1c2UgUUdyYXBoaWNzVmlldyBhbHNvIGNhbGN1bGF0ZXMKKyAgICAvLyAg ICB0aGUgc2l6ZSBvZiBpdHMgc2Nyb2xsYWJsZSBhcmVhIGFjY29yZGluZyB0byB0aGUgYW1vdW50 IG9mIGNvbnRlbnQgaW4gc2NlbmUgdGhhdCBpcyByZW5kZXJlZAorICAgIC8vICAgIG9mZnNjcmVl bi4KKyAgICAvLyAzKSBTZXQgUVdlYlBhZ2UncyBwcmVmZXJyZWRDb250ZW50c1NpemUgYWNjb3Jk aW5nIHRvIHRoZSBzaXplIG9mIFFHcmFwaGljc1ZpZXcncyB2aWV3cG9ydCwKKyAgICAvLyAgICBz byBXZWJDb3JlIHByb3Blcmx5IGxheXMgcGFnZXMgb3V0LgorICAgIC8vCisgICAgLy8gT24gdGhl IG90aGVyIGhhbmQsIHdoZW4gdG9nZ2xpbmcgcmVzaXplc1RvQ29udGVudHMgT0ZGLCB3ZSBzZXQg YmFjayB0aGUgZGVmYXVsdCB2YWx1ZXMsIGFzCisgICAgLy8gb3Bwb3NpdGUgYXMgZGVzY3JpYmVk IGFib3ZlLgogICAgIGlmIChtX3Jlc2l6ZXNUb0NvbnRlbnRzKSB7CiAgICAgICAgIHNldEhvcml6 b250YWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFzTmVlZGVkKTsKICAgICAgICAgc2V0 VmVydGljYWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFzTmVlZGVkKTsKKyAgICAgICAg c2NlbmUoKS0+c2V0U2NlbmVSZWN0KFFSZWN0RigpKTsKKyAgICAgICAgbV9pdGVtLT5wYWdlKCkt PnNldFByZWZlcnJlZENvbnRlbnRzU2l6ZShzaXplKCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAg IHNldEhvcml6b250YWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7CiAg ICAgICAgIHNldFZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5KFF0OjpTY3JvbGxCYXJBbHdheXNPZmYp OworICAgICAgICBtX2l0ZW0tPnBhZ2UoKS0+c2V0UHJlZmVycmVkQ29udGVudHNTaXplKFFTaXpl KCkpOworICAgICAgICBRUmVjdCB2aWV3cG9ydFJlY3QoUVBvaW50KDAsIDApLCBzaXplKCkpOwor ICAgICAgICBtX2l0ZW0tPnNldEdlb21ldHJ5KHZpZXdwb3J0UmVjdCk7CisgICAgICAgIHNjZW5l KCktPnNldFNjZW5lUmVjdCh2aWV3cG9ydFJlY3QpOwogICAgIH0KIH0KIAogdm9pZCBXZWJWaWV3 R3JhcGhpY3NCYXNlZDo6cmVzaXplRXZlbnQoUVJlc2l6ZUV2ZW50KiBldmVudCkKIHsKICAgICBR R3JhcGhpY3NWaWV3OjpyZXNpemVFdmVudChldmVudCk7Ci0gICAgaWYgKG1fcmVzaXplc1RvQ29u dGVudHMpCisKKyAgICBRU2l6ZSBzaXplKGV2ZW50LT5zaXplKCkpOworCisgICAgaWYgKG1fcmVz aXplc1RvQ29udGVudHMpIHsKKyAgICAgICAgbV9pdGVtLT5wYWdlKCktPnNldFByZWZlcnJlZENv bnRlbnRzU2l6ZShzaXplKTsKICAgICAgICAgcmV0dXJuOwotICAgIFFSZWN0RiByZWN0KFFQb2lu dCgwLCAwKSwgZXZlbnQtPnNpemUoKSk7CisgICAgfQorCisgICAgUVJlY3RGIHJlY3QoUVBvaW50 KDAsIDApLCBzaXplKTsKICAgICBtX2l0ZW0tPnNldEdlb21ldHJ5KHJlY3QpOwogICAgIHNjZW5l KCktPnNldFNjZW5lUmVjdChyZWN0KTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0VGVz dEJyb3dzZXIvd2Vidmlldy5oIGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmgK aW5kZXggOWI1MzNiMy4uNDMzODQ0YyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvUXRUZXN0QnJv d3Nlci93ZWJ2aWV3LmgKKysrIGIvV2ViS2l0VG9vbHMvUXRUZXN0QnJvd3Nlci93ZWJ2aWV3LmgK QEAgLTg0LDYgKzg0LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0UmVzaXplc1RvQ29udGVudHMo Ym9vbCBiKTsKICAgICBib29sIHJlc2l6ZXNUb0NvbnRlbnRzKCkgY29uc3QgeyByZXR1cm4gbV9y ZXNpemVzVG9Db250ZW50czsgfQogCisgICAgdm9pZCBzZXRDdXN0b21MYXlvdXRTaXplKGNvbnN0 IFFTaXplJiBzaXplKSB7IHJldHVybiBtX2l0ZW0tPnBhZ2UoKS0+c2V0UHJlZmVycmVkQ29udGVu dHNTaXplKHNpemUpOyB9CisgICAgUVNpemUgY3VzdG9tTGF5b3V0U2l6ZSgpIGNvbnN0IHsgcmV0 dXJuIG1faXRlbS0+cGFnZSgpLT5wcmVmZXJyZWRDb250ZW50c1NpemUoKTsgfQorCiAgICAgdm9p ZCBzZXRZUm90YXRpb24ocXJlYWwgYW5nbGUpCiAgICAgewogI2lmIFFUX1ZFUlNJT04gPj0gUVRf VkVSU0lPTl9DSEVDSyg0LCA2LCAwKQotLSAKMS43LjAuNAoK