37163 2010-04-06 12:02:52 -0700 [Qt] inputMethodQuery returns coordinates in web page coordinates rather than in item coordinates. 2010-04-26 03:36:49 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All Windows XP CLOSED FIXED Qt P2 Normal --- 35784 0 john.pavan webkit-unassigned ap commit-queue hausmann john.pavan joseph.ligman koshuin laszlo.gombos webkit.review.bot oldest_to_newest 209163 0 john.pavan 2010-04-06 12:02:52 -0700 If QGraphicsWebView::inputMethodQuery is asked to return the position of something on the web page, the values returned are in web page coordinates. As a QGraphicsWidget, QGraphicsWebView should be returning item coordinates (relative to it's position in the QGraphicsScene). For example, if the QGraphicsWebView contains a web page that has a cursor in an editable field at pixel 20,1200 and the web page has been scrolled so that the cursor is at 20,300. When the microfocus is queried, QGraphicsWebView::inputMethodQuery(Qt::ImMicroFocus) returns 20,1200, not 20,300. 209164 1 john.pavan 2010-04-06 12:04:14 -0700 I am working on getting a proposed fix ready for submission. 212595 2 53372 john.pavan 2010-04-14 14:57:00 -0700 Created attachment 53372 Proposed fix and unit test. Bug is confirmed on linux. Attached patch file should fix the problem, unit test is included. 214134 3 webkit.review.bot 2010-04-19 11:42:17 -0700 Attachment 53372 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WARNING: File exempt from style guide. Skipping: "WebKit/qt/Api/qgraphicswebview.cpp" WARNING: File exempt from style guide. Skipping: "WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp" WebKit/qt/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:7: Line contains tab character. [whitespace/tab] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 214151 4 53372 john.pavan 2010-04-19 12:09:33 -0700 Comment on attachment 53372 Proposed fix and unit test. >Index: WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp >=================================================================== >--- WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp (revision 57531) >+++ WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp (working copy) >@@ -31,6 +31,7 @@ > private slots: > void qgraphicswebview(); > void crashOnViewlessWebPages(); >+ void inputMethodQueryItemCoordinates(); > }; > > void tst_QGraphicsWebView::qgraphicswebview() >@@ -102,6 +103,43 @@ > QVERIFY(waitForSignal(page, SIGNAL(loadFinished(bool)))); > } > >+void tst_QGraphicsWebView::inputMethodQueryItemCoordinates() >+{ >+ QGraphicsScene scene; >+ QGraphicsView view(&scene); >+ >+ QGraphicsWebView* webView = new QGraphicsWebView; >+ QWebPage* page = new QWebPage; >+ webView->setPage(page); >+ >+ // set the size of the view to a known size >+ scene.addItem(webView); >+ webView->setGeometry(QRect(0, 0, 500, 500)); >+ >+ // set up a web page that's bigger than the size of the view >+ page->mainFrame()->setHtml(QString("data:text/html," >+ "<canvas id=\"testCanvas\" width=\"1000\" height=\"1000\">" >+ "This is a test canvas" >+ "</canvas>")); >+ page->mainFrame()->setFocus(); >+ >+ QTest::qWait(200); >+ view.show(); >+ >+ // get the initial microfocus >+ QVariant initialMicroFocus = webView->inputMethodQuery(Qt::ImMicroFocus); >+ QVERIFY(initialMicroFocus.isValid()); >+ >+ page->mainFrame()->scroll(300,300); >+ >+ QVariant currentMicroFocus = webView->inputMethodQuery(Qt::ImMicroFocus); >+ QVERIFY(currentMicroFocus.isValid()); >+ >+ QCOMPARE(initialMicroFocus.toRect().translated(-300,-300),currentMicroFocus.toRect()); >+ >+ delete webView; >+} >+ > QTEST_MAIN(tst_QGraphicsWebView) > > #include "tst_qgraphicswebview.moc" >Index: WebKit/qt/ChangeLog >=================================================================== >--- WebKit/qt/ChangeLog (revision 57608) >+++ WebKit/qt/ChangeLog (working copy) >@@ -1,3 +1,17 @@ >+2010-04-14 John Pavan <john.pavan@nokia.com> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ inputMethodQuery returns coordinates in web page coordinates rather than in item coordinates. >+ To fix this problem if the inputMethodQuery to the underlying QWebPage returns a QPoint, QPointF, QRect, or QRectF it is transformed to reflect the difference between the web page coordinates and the widget coordinates. >+ Added a unit test to reflect this as well. >+ https://bugs.webkit.org/show_bug.cgi?id=37163 >+ >+ * Api/qgraphicswebview.cpp: >+ (QGraphicsWebView::inputMethodQuery): >+ * tests/qgraphicswebview/tst_qgraphicswebview.cpp: >+ (tst_QGraphicsWebView::inputMethodQueryItemCoordinates): >+ > 2010-04-14 Aaron Boodman <aa@chromium.org> > > Reviewed by David Levin. >Index: WebKit/qt/Api/qgraphicswebview.cpp >=================================================================== >--- WebKit/qt/Api/qgraphicswebview.cpp (revision 57531) >+++ WebKit/qt/Api/qgraphicswebview.cpp (working copy) >@@ -668,9 +668,55 @@ > */ > QVariant QGraphicsWebView::inputMethodQuery(Qt::InputMethodQuery query) const > { >- if (d->page) >- return d->page->inputMethodQuery(query); >- return QVariant(); >+ // john.pavan@nokia.com: >+ // in cases of coordinates the QGraphicsWebView (as a QGraphicsWidget) >+ // should be returning coordinates in the reference frame of the >+ // item (qgraphicswebview), not the coordinates on the web page. >+ // To do this we need the viewport. >+ >+ QVariant retVal; >+ if (d->page) { >+ retVal = d->page->inputMethodQuery(query); >+ if (retVal.type() == QVariant::RectF >+ || retVal.type() == QVariant::PointF >+ || retVal.type() == QVariant::Rect >+ || retVal.type() == QVariant::Point) { >+ // get the scroll position of the current frame. >+ QPoint scrollPosition; >+ if (d->page->currentFrame()) >+ scrollPosition = d->page->currentFrame()->scrollPosition(); >+ else >+ scrollPosition = d->page->mainFrame()->scrollPosition(); >+ >+ >+ // now apply the appropriate transform >+ switch (retVal.type()) { >+ case QVariant::RectF: >+ retVal = retVal.toRectF().translated(-scrollPosition); >+ break; >+ >+ case QVariant::PointF: >+ retVal = retVal.toPointF() - scrollPosition; >+ break; >+ >+ case QVariant::Rect: >+ retVal = retVal.toRect().translated(-scrollPosition); >+ break; >+ >+ case QVariant::Point: >+ retVal = retVal.toPoint() - scrollPosition; >+ break; >+ >+ default: >+ // do nothing >+ qt_noop(); >+ break; >+ }; >+ } >+ >+ >+ } >+ return retVal; > } > > /*! \reimp 214161 5 53703 john.pavan 2010-04-19 12:20:24 -0700 Created attachment 53703 Patch round 2 214328 6 53703 hausmann 2010-04-19 16:33:47 -0700 Comment on attachment 53703 Patch round 2 Good observation with the bug and good that you made a unit test! I don't agree about your approach though. I think the scroll position of the frame should be taken into account right in QWebPage::inputMethodQuery, so that it works for QWebView and QGraphicsWebView. The code also becomes a lot simpler. Joe, Janne: What do you think? > =================================================================== > --- WebKit/qt/ChangeLog (revision 57608) > +++ WebKit/qt/ChangeLog (working copy) > @@ -1,3 +1,17 @@ > +2010-04-14 John Pavan <john.pavan@nokia.com> > + > + Reviewed by NOBODY (OOPS!). > + > + inputMethodQuery returns coordinates in web page coordinates rather than in item coordinates. Please put a newline between the title of the bug and the description of the fix. It's also good practice to prefix the title with [Qt] if it's a qt specific issue. > + // john.pavan@nokia.com: > + // in cases of coordinates the QGraphicsWebView (as a QGraphicsWidget) > + // should be returning coordinates in the reference frame of the > + // item (qgraphicswebview), not the coordinates on the web page. > + // To do this we need the viewport. You don't have to put your email address as a comment into the code. svn annotate / git blame will find out :-) 214634 7 joseph.ligman 2010-04-20 07:06:19 -0700 (In reply to comment #6) > (From update of attachment 53703 [details]) > > Good observation with the bug and good that you made a unit test! > > I don't agree about your approach though. I think the scroll position of the > frame should be taken into account > right in QWebPage::inputMethodQuery, so that it works for QWebView and > QGraphicsWebView. The code also becomes > a lot simpler. > > Joe, Janne: What do you think? > I agree, it does seem simpler to do this in QWebPage::inputMethodQuery. For another simplification, you might also look at ScrollView's contentsToWindow to do the coordinates conversion. 215945 8 54070 john.pavan 2010-04-22 10:29:53 -0700 Created attachment 54070 Fix applkied to QWebPage. Tests added for QGraphicsWebView and 215975 9 webkit.review.bot 2010-04-22 11:17:37 -0700 Attachment 54070 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/qt/ChangeLog:6: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:7: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:8: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:9: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:10: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:11: Line contains tab character. [whitespace/tab] [5] WebKit/qt/ChangeLog:12: Line contains tab character. [whitespace/tab] [5] WARNING: File exempt from style guide. Skipping: "WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp" WARNING: File exempt from style guide. Skipping: "WebKit/qt/Api/qwebpage.cpp" WARNING: File exempt from style guide. Skipping: "WebKit/qt/tests/qwebview/tst_qwebview.cpp" Total errors found: 7 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 215980 10 54078 john.pavan 2010-04-22 11:26:36 -0700 Created attachment 54078 Fix applied to QWebPage. Tests added for QGraphicsWebView and QWebView Tabs were in the changelog, removed them. 216089 11 54078 laszlo.gombos 2010-04-22 14:37:57 -0700 Comment on attachment 54078 Fix applied to QWebPage. Tests added for QGraphicsWebView and QWebView WebKit/qt/tests/qwebview/tst_qwebview.cpp:227 + This qWait does not seems to be needed, and will slow down running the automated tests. WebKit/qt/ChangeLog:7 + We need a reference here (link) to the bugzilla bugreport - this is automatically generated if you use the prepare-ChangeLog script. Overall the patch looks great, I would give an r+ if you would be a committer. Let's fix this 2 small issues in a new patch. 216097 12 54099 john.pavan 2010-04-22 14:50:19 -0700 Created attachment 54099 Updated changelog file, removed wait 216099 13 54099 laszlo.gombos 2010-04-22 14:59:46 -0700 Comment on attachment 54099 Updated changelog file, removed wait lgtm, r+. Thanks. 216233 14 54099 commit-queue 2010-04-22 19:52:31 -0700 Comment on attachment 54099 Updated changelog file, removed wait Clearing flags on attachment: 54099 Committed r58141: <http://trac.webkit.org/changeset/58141> 216234 15 commit-queue 2010-04-22 19:52:37 -0700 All reviewed patches have been landed. Closing bug. 216971 16 hausmann 2010-04-26 03:36:18 -0700 Revision r58141 cherry-picked into qtwebkit-2.0 with commit a7515d0cfe63634a2a983bbb2f5316bccdc9c4f8 53372 2010-04-14 14:57:00 -0700 2010-04-19 12:20:24 -0700 Proposed fix and unit test. QGraphicsWebViewInputMethodQuery.patch text/plain 5012 john.pavan SW5kZXg6IFdlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2 aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90 c3RfcWdyYXBoaWNzd2Vidmlldy5jcHAJKHJldmlzaW9uIDU3NTMxKQorKysgV2ViS2l0L3F0L3Rl c3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMSw2ICszMSw3IEBACiBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgcWdyYXBoaWNz d2VidmlldygpOwogICAgIHZvaWQgY3Jhc2hPblZpZXdsZXNzV2ViUGFnZXMoKTsKKyAgICB2b2lk IGlucHV0TWV0aG9kUXVlcnlJdGVtQ29vcmRpbmF0ZXMoKTsKIH07CiAKIHZvaWQgdHN0X1FHcmFw aGljc1dlYlZpZXc6OnFncmFwaGljc3dlYnZpZXcoKQpAQCAtMTAyLDYgKzEwMyw0MyBAQAogICAg IFFWRVJJRlkod2FpdEZvclNpZ25hbChwYWdlLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkp OwogfQogCit2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3OjppbnB1dE1ldGhvZFF1ZXJ5SXRlbUNv b3JkaW5hdGVzKCkKK3sKKyAgICBRR3JhcGhpY3NTY2VuZSBzY2VuZTsKKyAgICBRR3JhcGhpY3NW aWV3IHZpZXcoJnNjZW5lKTsKKworICAgIFFHcmFwaGljc1dlYlZpZXcqIHdlYlZpZXcgPSBuZXcg UUdyYXBoaWNzV2ViVmlldzsKKyAgICBRV2ViUGFnZSogcGFnZSA9IG5ldyBRV2ViUGFnZTsKKyAg ICB3ZWJWaWV3LT5zZXRQYWdlKHBhZ2UpOworCisgICAgLy8gc2V0IHRoZSBzaXplIG9mIHRoZSB2 aWV3IHRvIGEga25vd24gc2l6ZQorICAgIHNjZW5lLmFkZEl0ZW0od2ViVmlldyk7CisgICAgd2Vi Vmlldy0+c2V0R2VvbWV0cnkoUVJlY3QoMCwgMCwgNTAwLCA1MDApKTsKKworICAgIC8vIHNldCB1 cCBhIHdlYiBwYWdlIHRoYXQncyBiaWdnZXIgdGhhbiB0aGUgc2l6ZSBvZiB0aGUgdmlldworICAg IHBhZ2UtPm1haW5GcmFtZSgpLT5zZXRIdG1sKFFTdHJpbmcoImRhdGE6dGV4dC9odG1sLCIKKyAg ICAgICAgIjxjYW52YXMgaWQ9XCJ0ZXN0Q2FudmFzXCIgd2lkdGg9XCIxMDAwXCIgaGVpZ2h0PVwi MTAwMFwiPiIKKyAgICAgICAgIlRoaXMgaXMgYSB0ZXN0IGNhbnZhcyIKKyAgICAgICAgIjwvY2Fu dmFzPiIpKTsKKyAgICBwYWdlLT5tYWluRnJhbWUoKS0+c2V0Rm9jdXMoKTsKKworICAgIFFUZXN0 OjpxV2FpdCgyMDApOworICAgIHZpZXcuc2hvdygpOworICAgIAorICAgIC8vIGdldCB0aGUgaW5p dGlhbCBtaWNyb2ZvY3VzCisgICAgUVZhcmlhbnQgaW5pdGlhbE1pY3JvRm9jdXMgPSB3ZWJWaWV3 LT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbU1pY3JvRm9jdXMpOworICAgIFFWRVJJRlkoaW5pdGlh bE1pY3JvRm9jdXMuaXNWYWxpZCgpKTsKKworICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5zY3JvbGwo MzAwLDMwMCk7CisKKyAgICBRVmFyaWFudCBjdXJyZW50TWljcm9Gb2N1cyA9IHdlYlZpZXctPmlu cHV0TWV0aG9kUXVlcnkoUXQ6OkltTWljcm9Gb2N1cyk7CisgICAgUVZFUklGWShjdXJyZW50TWlj cm9Gb2N1cy5pc1ZhbGlkKCkpOworCisgICAgUUNPTVBBUkUoaW5pdGlhbE1pY3JvRm9jdXMudG9S ZWN0KCkudHJhbnNsYXRlZCgtMzAwLC0zMDApLGN1cnJlbnRNaWNyb0ZvY3VzLnRvUmVjdCgpKTsK KworICAgIGRlbGV0ZSB3ZWJWaWV3OworfQorCiBRVEVTVF9NQUlOKHRzdF9RR3JhcGhpY3NXZWJW aWV3KQogCiAjaW5jbHVkZSAidHN0X3FncmFwaGljc3dlYnZpZXcubW9jIgpJbmRleDogV2ViS2l0 L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lv biA1NzYwOCkKKysrIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxNyBAQAorMjAxMC0wNC0xNCAgSm9obiBQYXZhbiAgPGpvaG4ucGF2YW5Abm9raWEuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGlucHV0TWV0 aG9kUXVlcnkgcmV0dXJucyBjb29yZGluYXRlcyBpbiB3ZWIgcGFnZSBjb29yZGluYXRlcyByYXRo ZXIgdGhhbiBpbiBpdGVtIGNvb3JkaW5hdGVzLgorCVRvIGZpeCB0aGlzIHByb2JsZW0gaWYgdGhl IGlucHV0TWV0aG9kUXVlcnkgdG8gdGhlIHVuZGVybHlpbmcgUVdlYlBhZ2UgcmV0dXJucyBhIFFQ b2ludCwgUVBvaW50RiwgUVJlY3QsIG9yIFFSZWN0RiBpdCBpcyB0cmFuc2Zvcm1lZCB0byByZWZs ZWN0IHRoZSBkaWZmZXJlbmNlIGJldHdlZW4gdGhlIHdlYiBwYWdlIGNvb3JkaW5hdGVzIGFuZCB0 aGUgd2lkZ2V0IGNvb3JkaW5hdGVzLgorCUFkZGVkIGEgdW5pdCB0ZXN0IHRvIHJlZmxlY3QgdGhp cyBhcyB3ZWxsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzcxNjMKKworICAgICAgICAqIEFwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoKKyAgICAgICAg KFFHcmFwaGljc1dlYlZpZXc6OmlucHV0TWV0aG9kUXVlcnkpOgorICAgICAgICAqIHRlc3RzL3Fn cmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwOgorICAgICAgICAodHN0X1FH cmFwaGljc1dlYlZpZXc6OmlucHV0TWV0aG9kUXVlcnlJdGVtQ29vcmRpbmF0ZXMpOgorCiAyMDEw LTA0LTE0ICBBYXJvbiBCb29kbWFuICA8YWFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhdmlkIExldmluLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCShy ZXZpc2lvbiA1NzUzMSkKKysrIFdlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTY2OCw5ICs2NjgsNTUgQEAKICovCiBRVmFyaWFudCBRR3JhcGhpY3NX ZWJWaWV3OjppbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbnB1dE1ldGhvZFF1ZXJ5IHF1ZXJ5KSBjb25z dAogewotICAgIGlmIChkLT5wYWdlKQotICAgICAgICByZXR1cm4gZC0+cGFnZS0+aW5wdXRNZXRo b2RRdWVyeShxdWVyeSk7Ci0gICAgcmV0dXJuIFFWYXJpYW50KCk7CisgICAgLy8gam9obi5wYXZh bkBub2tpYS5jb206CisgICAgLy8gaW4gY2FzZXMgb2YgY29vcmRpbmF0ZXMgdGhlIFFHcmFwaGlj c1dlYlZpZXcgKGFzIGEgUUdyYXBoaWNzV2lkZ2V0KQorICAgIC8vIHNob3VsZCBiZSByZXR1cm5p bmcgY29vcmRpbmF0ZXMgaW4gdGhlIHJlZmVyZW5jZSBmcmFtZSBvZiB0aGUKKyAgICAvLyBpdGVt IChxZ3JhcGhpY3N3ZWJ2aWV3KSwgbm90IHRoZSBjb29yZGluYXRlcyBvbiB0aGUgd2ViIHBhZ2Uu CisgICAgLy8gVG8gZG8gdGhpcyB3ZSBuZWVkIHRoZSB2aWV3cG9ydC4KKworICAgIFFWYXJpYW50 IHJldFZhbDsKKyAgICBpZiAoZC0+cGFnZSkgeworICAgICAgICByZXRWYWwgPSBkLT5wYWdlLT5p bnB1dE1ldGhvZFF1ZXJ5KHF1ZXJ5KTsKKyAgICAgICAgaWYgKHJldFZhbC50eXBlKCkgPT0gUVZh cmlhbnQ6OlJlY3RGCisgICAgICAgICAgICB8fCByZXRWYWwudHlwZSgpID09IFFWYXJpYW50OjpQ b2ludEYKKyAgICAgICAgICAgIHx8IHJldFZhbC50eXBlKCkgPT0gUVZhcmlhbnQ6OlJlY3QKKyAg ICAgICAgICAgIHx8IHJldFZhbC50eXBlKCkgPT0gUVZhcmlhbnQ6OlBvaW50KSB7CisgICAgICAg ICAgICAvLyBnZXQgdGhlIHNjcm9sbCBwb3NpdGlvbiBvZiB0aGUgY3VycmVudCBmcmFtZS4KKyAg ICAgICAgICAgICAgICBRUG9pbnQgc2Nyb2xsUG9zaXRpb247CisgICAgICAgICAgICAgICAgaWYg KGQtPnBhZ2UtPmN1cnJlbnRGcmFtZSgpKQorICAgICAgICAgICAgICAgICAgICBzY3JvbGxQb3Np dGlvbiA9IGQtPnBhZ2UtPmN1cnJlbnRGcmFtZSgpLT5zY3JvbGxQb3NpdGlvbigpOworICAgICAg ICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgc2Nyb2xsUG9zaXRpb24gPSBkLT5w YWdlLT5tYWluRnJhbWUoKS0+c2Nyb2xsUG9zaXRpb24oKTsKKyAgICAgICAgICAgICAgICAKKwor ICAgICAgICAgICAgLy8gbm93IGFwcGx5IHRoZSBhcHByb3ByaWF0ZSB0cmFuc2Zvcm0KKyAgICAg ICAgICAgICAgICBzd2l0Y2ggKHJldFZhbC50eXBlKCkpIHsKKyAgICAgICAgICAgICAgICBjYXNl IFFWYXJpYW50OjpSZWN0RjoKKyAgICAgICAgICAgICAgICAgICAgcmV0VmFsID0gcmV0VmFsLnRv UmVjdEYoKS50cmFuc2xhdGVkKC1zY3JvbGxQb3NpdGlvbik7CisgICAgICAgICAgICAgICAgICAg IGJyZWFrOworCisgICAgICAgICAgICAgICAgY2FzZSBRVmFyaWFudDo6UG9pbnRGOgorICAgICAg ICAgICAgICAgICAgICByZXRWYWwgPSByZXRWYWwudG9Qb2ludEYoKSAtIHNjcm9sbFBvc2l0aW9u OworICAgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgIGNhc2UgUVZh cmlhbnQ6OlJlY3Q6CisgICAgICAgICAgICAgICAgICAgIHJldFZhbCA9IHJldFZhbC50b1JlY3Qo KS50cmFuc2xhdGVkKC1zY3JvbGxQb3NpdGlvbik7CisgICAgICAgICAgICAgICAgICAgIGJyZWFr OworCisgICAgICAgICAgICAgICAgY2FzZSBRVmFyaWFudDo6UG9pbnQ6CisgICAgICAgICAgICAg ICAgICAgIHJldFZhbCA9IHJldFZhbC50b1BvaW50KCkgLSBzY3JvbGxQb3NpdGlvbjsKKyAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBkZWZhdWx0OgorICAgICAg ICAgICAgICAgICAgICAvLyBkbyBub3RoaW5nCisgICAgICAgICAgICAgICAgICAgIHF0X25vb3Ao KTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfTsKKyAgICAg ICAgfQorCisKKyAgICB9CisgICAgcmV0dXJuIHJldFZhbDsKIH0KIAogLyohIFxyZWltcAo= 53703 2010-04-19 12:20:24 -0700 2010-04-22 10:29:53 -0700 Patch round 2 QGraphicsWebViewInputMethodQuery.patch text/plain 5026 john.pavan SW5kZXg6IFdlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2 aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90 c3RfcWdyYXBoaWNzd2Vidmlldy5jcHAJKHJldmlzaW9uIDU3NTMxKQorKysgV2ViS2l0L3F0L3Rl c3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMSw2ICszMSw3IEBACiBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgcWdyYXBoaWNz d2VidmlldygpOwogICAgIHZvaWQgY3Jhc2hPblZpZXdsZXNzV2ViUGFnZXMoKTsKKyAgICB2b2lk IGlucHV0TWV0aG9kUXVlcnlJdGVtQ29vcmRpbmF0ZXMoKTsKIH07CiAKIHZvaWQgdHN0X1FHcmFw aGljc1dlYlZpZXc6OnFncmFwaGljc3dlYnZpZXcoKQpAQCAtMTAyLDYgKzEwMyw0MyBAQAogICAg IFFWRVJJRlkod2FpdEZvclNpZ25hbChwYWdlLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkp OwogfQogCit2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3OjppbnB1dE1ldGhvZFF1ZXJ5SXRlbUNv b3JkaW5hdGVzKCkKK3sKKyAgICBRR3JhcGhpY3NTY2VuZSBzY2VuZTsKKyAgICBRR3JhcGhpY3NW aWV3IHZpZXcoJnNjZW5lKTsKKworICAgIFFHcmFwaGljc1dlYlZpZXcqIHdlYlZpZXcgPSBuZXcg UUdyYXBoaWNzV2ViVmlldzsKKyAgICBRV2ViUGFnZSogcGFnZSA9IG5ldyBRV2ViUGFnZTsKKyAg ICB3ZWJWaWV3LT5zZXRQYWdlKHBhZ2UpOworCisgICAgLy8gc2V0IHRoZSBzaXplIG9mIHRoZSB2 aWV3IHRvIGEga25vd24gc2l6ZQorICAgIHNjZW5lLmFkZEl0ZW0od2ViVmlldyk7CisgICAgd2Vi Vmlldy0+c2V0R2VvbWV0cnkoUVJlY3QoMCwgMCwgNTAwLCA1MDApKTsKKworICAgIC8vIHNldCB1 cCBhIHdlYiBwYWdlIHRoYXQncyBiaWdnZXIgdGhhbiB0aGUgc2l6ZSBvZiB0aGUgdmlldworICAg IHBhZ2UtPm1haW5GcmFtZSgpLT5zZXRIdG1sKFFTdHJpbmcoImRhdGE6dGV4dC9odG1sLCIKKyAg ICAgICAgIjxjYW52YXMgaWQ9XCJ0ZXN0Q2FudmFzXCIgd2lkdGg9XCIxMDAwXCIgaGVpZ2h0PVwi MTAwMFwiPiIKKyAgICAgICAgIlRoaXMgaXMgYSB0ZXN0IGNhbnZhcyIKKyAgICAgICAgIjwvY2Fu dmFzPiIpKTsKKyAgICBwYWdlLT5tYWluRnJhbWUoKS0+c2V0Rm9jdXMoKTsKKworICAgIFFUZXN0 OjpxV2FpdCgyMDApOworICAgIHZpZXcuc2hvdygpOworICAgIAorICAgIC8vIGdldCB0aGUgaW5p dGlhbCBtaWNyb2ZvY3VzCisgICAgUVZhcmlhbnQgaW5pdGlhbE1pY3JvRm9jdXMgPSB3ZWJWaWV3 LT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbU1pY3JvRm9jdXMpOworICAgIFFWRVJJRlkoaW5pdGlh bE1pY3JvRm9jdXMuaXNWYWxpZCgpKTsKKworICAgIHBhZ2UtPm1haW5GcmFtZSgpLT5zY3JvbGwo MzAwLDMwMCk7CisKKyAgICBRVmFyaWFudCBjdXJyZW50TWljcm9Gb2N1cyA9IHdlYlZpZXctPmlu cHV0TWV0aG9kUXVlcnkoUXQ6OkltTWljcm9Gb2N1cyk7CisgICAgUVZFUklGWShjdXJyZW50TWlj cm9Gb2N1cy5pc1ZhbGlkKCkpOworCisgICAgUUNPTVBBUkUoaW5pdGlhbE1pY3JvRm9jdXMudG9S ZWN0KCkudHJhbnNsYXRlZCgtMzAwLC0zMDApLGN1cnJlbnRNaWNyb0ZvY3VzLnRvUmVjdCgpKTsK KworICAgIGRlbGV0ZSB3ZWJWaWV3OworfQorCiBRVEVTVF9NQUlOKHRzdF9RR3JhcGhpY3NXZWJW aWV3KQogCiAjaW5jbHVkZSAidHN0X3FncmFwaGljc3dlYnZpZXcubW9jIgpJbmRleDogV2ViS2l0 L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdlTG9nCShyZXZpc2lv biA1NzYwOCkKKysrIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxNyBAQAorMjAxMC0wNC0xNCAgSm9obiBQYXZhbiAgPGpvaG4ucGF2YW5Abm9raWEuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGlucHV0TWV0 aG9kUXVlcnkgcmV0dXJucyBjb29yZGluYXRlcyBpbiB3ZWIgcGFnZSBjb29yZGluYXRlcyByYXRo ZXIgdGhhbiBpbiBpdGVtIGNvb3JkaW5hdGVzLgorICAgICAgICBUbyBmaXggdGhpcyBwcm9ibGVt IGlmIHRoZSBpbnB1dE1ldGhvZFF1ZXJ5IHRvIHRoZSB1bmRlcmx5aW5nIFFXZWJQYWdlIHJldHVy bnMgYSBRUG9pbnQsIFFQb2ludEYsIFFSZWN0LCBvciBRUmVjdEYgaXQgaXMgdHJhbnNmb3JtZWQg dG8gcmVmbGVjdCB0aGUgZGlmZmVyZW5jZSBiZXR3ZWVuIHRoZSB3ZWIgcGFnZSBjb29yZGluYXRl cyBhbmQgdGhlIHdpZGdldCBjb29yZGluYXRlcy4KKyAgICAgICAgQWRkZWQgYSB1bml0IHRlc3Qg dG8gcmVmbGVjdCB0aGlzIGFzIHdlbGwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNzE2MworCisgICAgICAgICogQXBpL3FncmFwaGljc3dlYnZpZXcu Y3BwOgorICAgICAgICAoUUdyYXBoaWNzV2ViVmlldzo6aW5wdXRNZXRob2RRdWVyeSk6CisgICAg ICAgICogdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHA6Cisg ICAgICAgICh0c3RfUUdyYXBoaWNzV2ViVmlldzo6aW5wdXRNZXRob2RRdWVyeUl0ZW1Db29yZGlu YXRlcyk6CisKIDIwMTAtMDQtMTQgIEFhcm9uIEJvb2RtYW4gIDxhYUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3Fn cmFwaGljc3dlYnZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcWdyYXBoaWNz d2Vidmlldy5jcHAJKHJldmlzaW9uIDU3NTMxKQorKysgV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3 ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjY4LDkgKzY2OCw1NSBAQAogKi8KIFFWYXJp YW50IFFHcmFwaGljc1dlYlZpZXc6OmlucHV0TWV0aG9kUXVlcnkoUXQ6OklucHV0TWV0aG9kUXVl cnkgcXVlcnkpIGNvbnN0CiB7Ci0gICAgaWYgKGQtPnBhZ2UpCi0gICAgICAgIHJldHVybiBkLT5w YWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KHF1ZXJ5KTsKLSAgICByZXR1cm4gUVZhcmlhbnQoKTsKKyAg ICAvLyBqb2huLnBhdmFuQG5va2lhLmNvbToKKyAgICAvLyBpbiBjYXNlcyBvZiBjb29yZGluYXRl cyB0aGUgUUdyYXBoaWNzV2ViVmlldyAoYXMgYSBRR3JhcGhpY3NXaWRnZXQpCisgICAgLy8gc2hv dWxkIGJlIHJldHVybmluZyBjb29yZGluYXRlcyBpbiB0aGUgcmVmZXJlbmNlIGZyYW1lIG9mIHRo ZQorICAgIC8vIGl0ZW0gKHFncmFwaGljc3dlYnZpZXcpLCBub3QgdGhlIGNvb3JkaW5hdGVzIG9u IHRoZSB3ZWIgcGFnZS4KKyAgICAvLyBUbyBkbyB0aGlzIHdlIG5lZWQgdGhlIHZpZXdwb3J0Lgor CisgICAgUVZhcmlhbnQgcmV0VmFsOworICAgIGlmIChkLT5wYWdlKSB7CisgICAgICAgIHJldFZh bCA9IGQtPnBhZ2UtPmlucHV0TWV0aG9kUXVlcnkocXVlcnkpOworICAgICAgICBpZiAocmV0VmFs LnR5cGUoKSA9PSBRVmFyaWFudDo6UmVjdEYKKyAgICAgICAgICAgIHx8IHJldFZhbC50eXBlKCkg PT0gUVZhcmlhbnQ6OlBvaW50RgorICAgICAgICAgICAgfHwgcmV0VmFsLnR5cGUoKSA9PSBRVmFy aWFudDo6UmVjdAorICAgICAgICAgICAgfHwgcmV0VmFsLnR5cGUoKSA9PSBRVmFyaWFudDo6UG9p bnQpIHsKKyAgICAgICAgICAgIC8vIGdldCB0aGUgc2Nyb2xsIHBvc2l0aW9uIG9mIHRoZSBjdXJy ZW50IGZyYW1lLgorICAgICAgICAgICAgICAgIFFQb2ludCBzY3JvbGxQb3NpdGlvbjsKKyAgICAg ICAgICAgICAgICBpZiAoZC0+cGFnZS0+Y3VycmVudEZyYW1lKCkpCisgICAgICAgICAgICAgICAg ICAgIHNjcm9sbFBvc2l0aW9uID0gZC0+cGFnZS0+Y3VycmVudEZyYW1lKCktPnNjcm9sbFBvc2l0 aW9uKCk7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBzY3JvbGxQ b3NpdGlvbiA9IGQtPnBhZ2UtPm1haW5GcmFtZSgpLT5zY3JvbGxQb3NpdGlvbigpOworICAgICAg ICAgICAgICAgIAorCisgICAgICAgICAgICAvLyBub3cgYXBwbHkgdGhlIGFwcHJvcHJpYXRlIHRy YW5zZm9ybQorICAgICAgICAgICAgICAgIHN3aXRjaCAocmV0VmFsLnR5cGUoKSkgeworICAgICAg ICAgICAgICAgIGNhc2UgUVZhcmlhbnQ6OlJlY3RGOgorICAgICAgICAgICAgICAgICAgICByZXRW YWwgPSByZXRWYWwudG9SZWN0RigpLnRyYW5zbGF0ZWQoLXNjcm9sbFBvc2l0aW9uKTsKKyAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBjYXNlIFFWYXJpYW50OjpQ b2ludEY6CisgICAgICAgICAgICAgICAgICAgIHJldFZhbCA9IHJldFZhbC50b1BvaW50RigpIC0g c2Nyb2xsUG9zaXRpb247CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAg ICAgICAgY2FzZSBRVmFyaWFudDo6UmVjdDoKKyAgICAgICAgICAgICAgICAgICAgcmV0VmFsID0g cmV0VmFsLnRvUmVjdCgpLnRyYW5zbGF0ZWQoLXNjcm9sbFBvc2l0aW9uKTsKKyAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBjYXNlIFFWYXJpYW50OjpQb2ludDoK KyAgICAgICAgICAgICAgICAgICAgcmV0VmFsID0gcmV0VmFsLnRvUG9pbnQoKSAtIHNjcm9sbFBv c2l0aW9uOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAgICAgICAgICAgIGRl ZmF1bHQ6CisgICAgICAgICAgICAgICAgICAgIC8vIGRvIG5vdGhpbmcKKyAgICAgICAgICAgICAg ICAgICAgcXRfbm9vcCgpOworICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg ICAgICB9OworICAgICAgICB9CisKKworICAgIH0KKyAgICByZXR1cm4gcmV0VmFsOwogfQogCiAv KiEgXHJlaW1wCg== 54070 2010-04-22 10:29:53 -0700 2010-04-22 11:26:36 -0700 Fix applkied to QWebPage. Tests added for QGraphicsWebView and QWebPageMicroFocusFix.patch text/plain 4952 john.pavan SW5kZXg6IFdlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCShyZXZpc2lv biA1ODAxNSkKKysrIFdlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw3IEBACiAKICAgICB2b2lkIHJldXNlUGFnZV9kYXRh KCk7CiAgICAgdm9pZCByZXVzZVBhZ2UoKTsKKyAgICB2b2lkIG1pY3JvRm9jdXNDb29yZGluYXRl cygpOwogCiAgICAgdm9pZCBjcmFzaFRlc3RzKCk7CiB9OwpAQCAtMjAzLDcgKzIwNCwzMyBAQAog ICAgIFFUUllfVkVSSUZZKHRlc3Rlci5tX2V4ZWN1dGVkKTsgLy8gSWYgZmFpbCBpdCBtZWFucyB0 aGF0IHRoZSB0ZXN0IHdhc24ndCBleGVjdXRlZC4KIH0KIAordm9pZCB0c3RfUVdlYlZpZXc6Om1p Y3JvRm9jdXNDb29yZGluYXRlcygpCit7CisgICAgUVdlYlBhZ2UqIHBhZ2UgPSBuZXcgUVdlYlBh Z2U7CisgICAgUVdlYlZpZXcqIHdlYlZpZXcgPSBuZXcgUVdlYlZpZXc7CisgICAgd2ViVmlldy0+ c2V0UGFnZSggcGFnZSApOwogCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPnNldEh0bWwoIjxodG1s Pjxib2R5PiIgXAorICAgICAgICAiPGlucHV0IHR5cGU9J3RleHQnIGlkPSdpbnB1dDEnIHN0eWxl PSdmb250LS1mYW1pbHk6IHNlcmlmJyB2YWx1ZT0nJyBtYXhsZW5ndGg9JzIwJy8+PGJyPiIgXAor ICAgICAgICAiPGNhbnZhcyBpZD0nY2FudmFzMScgd2lkdGg9JzUwMCcgaGVpZ2h0PSc1MDAnLz4i IFwKKyAgICAgICAgIjxpbnB1dCB0eXBlPSdwYXNzd29yZCcvPjxicj4iIFwKKyAgICAgICAgIjxj YW52YXMgaWQ9J2NhbnZhczInIHdpZHRoPSc1MDAnIGhlaWdodD0nNTAwJy8+IiBcCisgICAgICAg ICI8L2JvZHk+PC9odG1sPiIpOworCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPnNldEZvY3VzKCk7 CisKKyAgICBRVmFyaWFudCBpbml0aWFsTWljcm9Gb2N1cyA9IHBhZ2UtPmlucHV0TWV0aG9kUXVl cnkoUXQ6OkltTWljcm9Gb2N1cyk7CisgICAgUVZFUklGWShpbml0aWFsTWljcm9Gb2N1cy5pc1Zh bGlkKCkpOworCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPnNjcm9sbCgwLDUwKTsKKyAgICBRVGVz dDo6cVdhaXQoMjAwKTsKKworICAgIFFWYXJpYW50IGN1cnJlbnRNaWNyb0ZvY3VzID0gcGFnZS0+ aW5wdXRNZXRob2RRdWVyeShRdDo6SW1NaWNyb0ZvY3VzKTsKKyAgICBRVkVSSUZZKGN1cnJlbnRN aWNyb0ZvY3VzLmlzVmFsaWQoKSk7CisKKyAgICBRQ09NUEFSRShpbml0aWFsTWljcm9Gb2N1cy50 b1JlY3QoKS50cmFuc2xhdGVkKFFQb2ludCgwLC01MCkpLCBjdXJyZW50TWljcm9Gb2N1cy50b1Jl Y3QoKSk7Cit9CisKIFFURVNUX01BSU4odHN0X1FXZWJWaWV3KQogI2luY2x1ZGUgInRzdF9xd2Vi dmlldy5tb2MiCkluZGV4OiBXZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdy YXBoaWNzd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGlj c3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCShyZXZpc2lvbiA1ODAxNSkKKysrIFdl YktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogcHJpdmF0ZSBzbG90czoKICAgICB2b2lk IHFncmFwaGljc3dlYnZpZXcoKTsKICAgICB2b2lkIGNyYXNoT25WaWV3bGVzc1dlYlBhZ2VzKCk7 CisgICAgdm9pZCBtaWNyb0ZvY3VzQ29vcmRpbmF0ZXMoKTsKIH07CiAKIHZvaWQgdHN0X1FHcmFw aGljc1dlYlZpZXc6OnFncmFwaGljc3dlYnZpZXcoKQpAQCAtMTAyLDYgKzEwMyw0MCBAQAogICAg IFFWRVJJRlkod2FpdEZvclNpZ25hbChwYWdlLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkp OwogfQogCit2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3OjptaWNyb0ZvY3VzQ29vcmRpbmF0ZXMo KQoreworICAgIFFXZWJQYWdlKiBwYWdlID0gbmV3IFFXZWJQYWdlOworICAgIFFHcmFwaGljc1dl YlZpZXcqIHdlYlZpZXcgPSBuZXcgUUdyYXBoaWNzV2ViVmlldzsKKyAgICB3ZWJWaWV3LT5zZXRQ YWdlKCBwYWdlICk7CisgICAgUUdyYXBoaWNzVmlldyogdmlldyA9IG5ldyBRR3JhcGhpY3NWaWV3 OworICAgIFFHcmFwaGljc1NjZW5lKiBzY2VuZSA9IG5ldyBRR3JhcGhpY3NTY2VuZSh2aWV3KTsK KyAgICB2aWV3LT5zZXRTY2VuZShzY2VuZSk7CisgICAgc2NlbmUtPmFkZEl0ZW0od2ViVmlldyk7 CisgICAgdmlldy0+c2V0R2VvbWV0cnkoUVJlY3QoMCwwLDUwMCw1MDApKTsKKworICAgIHBhZ2Ut Pm1haW5GcmFtZSgpLT5zZXRIdG1sKCI8aHRtbD48Ym9keT4iIFwKKyAgICAgICAgIjxpbnB1dCB0 eXBlPSd0ZXh0JyBpZD0naW5wdXQxJyBzdHlsZT0nZm9udC0tZmFtaWx5OiBzZXJpZicgdmFsdWU9 JycgbWF4bGVuZ3RoPScyMCcvPjxicj4iIFwKKyAgICAgICAgIjxjYW52YXMgaWQ9J2NhbnZhczEn IHdpZHRoPSc1MDAnIGhlaWdodD0nNTAwJy8+IiBcCisgICAgICAgICI8aW5wdXQgdHlwZT0ncGFz c3dvcmQnLz48YnI+IiBcCisgICAgICAgICI8Y2FudmFzIGlkPSdjYW52YXMyJyB3aWR0aD0nNTAw JyBoZWlnaHQ9JzUwMCcvPiIgXAorICAgICAgICAiPC9ib2R5PjwvaHRtbD4iKTsKKworICAgIHBh Z2UtPm1haW5GcmFtZSgpLT5zZXRGb2N1cygpOworCisgICAgUVZhcmlhbnQgaW5pdGlhbE1pY3Jv Rm9jdXMgPSBwYWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbU1pY3JvRm9jdXMpOworICAgIFFW RVJJRlkoaW5pdGlhbE1pY3JvRm9jdXMuaXNWYWxpZCgpKTsKKworICAgIHBhZ2UtPm1haW5GcmFt ZSgpLT5zY3JvbGwoMCwzMDApOworCisgICAgUVZhcmlhbnQgY3VycmVudE1pY3JvRm9jdXMgPSBw YWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbU1pY3JvRm9jdXMpOworICAgIFFWRVJJRlkoY3Vy cmVudE1pY3JvRm9jdXMuaXNWYWxpZCgpKTsKKworICAgIFFDT01QQVJFKGluaXRpYWxNaWNyb0Zv Y3VzLnRvUmVjdCgpLnRyYW5zbGF0ZWQoUVBvaW50KDAsLTMwMCkpLCBjdXJyZW50TWljcm9Gb2N1 cy50b1JlY3QoKSk7CisKKyAgICBkZWxldGUgdmlldzsKK30KKworCiBRVEVTVF9NQUlOKHRzdF9R R3JhcGhpY3NXZWJWaWV3KQogCiAjaW5jbHVkZSAidHN0X3FncmFwaGljc3dlYnZpZXcubW9jIgpJ bmRleDogV2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdl TG9nCShyZXZpc2lvbiA1ODEwMikKKysrIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wNC0yMiAgSm9obiBQYXZhbiAgPGpvaG4ucGF2YW5A bm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gUVdlYlBhZ2U6OmlucHV0TWV0aG9kUXVlcnkoUXQ6OkltTWljcm9Gb2N1cykgCisJ cmV0dXJucyByZXN1bHRzIGluIHRoZSBjb29yZGluYXRlIHN5c3RlbSBvZiB0aGUgd2ViIHBhZ2Uu CisJCisJUVdlYlBhZ2U6OmlucHV0TWV0aG9kUXVlcnkgaXMgbW9kaWZpZWQgc28gdGhhdCBpdAor CXJldHVybnMgY29vcmRpbmF0ZXMgaW4gdGhlIHdpZGdldCdzIGNvb3JkaW5hdGUgc3lzdGVtLgor CVRlc3RzIGFyZSBhZGRlZCBmb3IgUUdyYXBoaWNzV2ViVmlldyBhbmQgUVdlYlZpZXcKKwl0byB2 ZXJpZnkgdGhhdCB0aGlzIGJlaGF2aW9yIGlzIGNvcnJlY3QgYWZ0ZXIgdGhlIHdlYnBhZ2UKKwlo YXMgYmVlbiBzY3JvbGxlZC4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6CisgICAgICAg IChRV2ViUGFnZTo6aW5wdXRNZXRob2RRdWVyeSk6CisgICAgICAgICogdGVzdHMvcWdyYXBoaWNz d2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHA6CisgICAgICAgICh0c3RfUUdyYXBoaWNz V2ViVmlldzo6bWljcm9Gb2N1c0Nvb3JkaW5hdGVzKToKKyAgICAgICAgKiB0ZXN0cy9xd2Vidmll dy90c3RfcXdlYnZpZXcuY3BwOgorICAgICAgICAodHN0X1FXZWJWaWV3OjptaWNyb0ZvY3VzQ29v cmRpbmF0ZXMpOgorCiAyMDEwLTA0LTIyICBKb2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJj b3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJp c3RpYW5zZW4uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAkocmV2aXNpb24gNTgwMTUpCisrKyBXZWJLaXQv cXQvQXBpL3F3ZWJwYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQzNyw3ICsxNDM3LDcgQEAK ICAgICAgICAgICAgICAgICAvLyBXZSBjYW4ndCBhY2Nlc3MgYWJzb2x1dGVDYXJldEJvdW5kcygp IHdoaWxlIHRoZSB2aWV3IG5lZWRzIHRvIGxheW91dC4KICAgICAgICAgICAgICAgICByZXR1cm4g UVZhcmlhbnQoKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBRVmFyaWFudChm cmFtZS0+c2VsZWN0aW9uKCktPmFic29sdXRlQ2FyZXRCb3VuZHMoKSk7CisgICAgICAgICAgICBy ZXR1cm4gUVZhcmlhbnQoIHZpZXctPmNvbnRlbnRzVG9XaW5kb3coIGZyYW1lLT5zZWxlY3Rpb24o KS0+YWJzb2x1dGVDYXJldEJvdW5kcygpICkgKTsKICAgICAgICAgfQogICAgICAgICBjYXNlIFF0 OjpJbUZvbnQ6IHsKICAgICAgICAgICAgIGlmIChyZW5kZXJUZXh0Q29udHJvbCkgewo= 54078 2010-04-22 11:26:36 -0700 2010-04-22 14:50:19 -0700 Fix applied to QWebPage. Tests added for QGraphicsWebView and QWebView QWebPageMicroFocusFix.patch text/plain 5001 john.pavan SW5kZXg6IFdlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCShyZXZpc2lv biA1ODAxNSkKKysrIFdlYktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw3IEBACiAKICAgICB2b2lkIHJldXNlUGFnZV9kYXRh KCk7CiAgICAgdm9pZCByZXVzZVBhZ2UoKTsKKyAgICB2b2lkIG1pY3JvRm9jdXNDb29yZGluYXRl cygpOwogCiAgICAgdm9pZCBjcmFzaFRlc3RzKCk7CiB9OwpAQCAtMjAzLDcgKzIwNCwzMyBAQAog ICAgIFFUUllfVkVSSUZZKHRlc3Rlci5tX2V4ZWN1dGVkKTsgLy8gSWYgZmFpbCBpdCBtZWFucyB0 aGF0IHRoZSB0ZXN0IHdhc24ndCBleGVjdXRlZC4KIH0KIAordm9pZCB0c3RfUVdlYlZpZXc6Om1p Y3JvRm9jdXNDb29yZGluYXRlcygpCit7CisgICAgUVdlYlBhZ2UqIHBhZ2UgPSBuZXcgUVdlYlBh Z2U7CisgICAgUVdlYlZpZXcqIHdlYlZpZXcgPSBuZXcgUVdlYlZpZXc7CisgICAgd2ViVmlldy0+ c2V0UGFnZSggcGFnZSApOwogCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPnNldEh0bWwoIjxodG1s Pjxib2R5PiIgXAorICAgICAgICAiPGlucHV0IHR5cGU9J3RleHQnIGlkPSdpbnB1dDEnIHN0eWxl PSdmb250LS1mYW1pbHk6IHNlcmlmJyB2YWx1ZT0nJyBtYXhsZW5ndGg9JzIwJy8+PGJyPiIgXAor ICAgICAgICAiPGNhbnZhcyBpZD0nY2FudmFzMScgd2lkdGg9JzUwMCcgaGVpZ2h0PSc1MDAnLz4i IFwKKyAgICAgICAgIjxpbnB1dCB0eXBlPSdwYXNzd29yZCcvPjxicj4iIFwKKyAgICAgICAgIjxj YW52YXMgaWQ9J2NhbnZhczInIHdpZHRoPSc1MDAnIGhlaWdodD0nNTAwJy8+IiBcCisgICAgICAg ICI8L2JvZHk+PC9odG1sPiIpOworCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPnNldEZvY3VzKCk7 CisKKyAgICBRVmFyaWFudCBpbml0aWFsTWljcm9Gb2N1cyA9IHBhZ2UtPmlucHV0TWV0aG9kUXVl cnkoUXQ6OkltTWljcm9Gb2N1cyk7CisgICAgUVZFUklGWShpbml0aWFsTWljcm9Gb2N1cy5pc1Zh bGlkKCkpOworCisgICAgcGFnZS0+bWFpbkZyYW1lKCktPnNjcm9sbCgwLDUwKTsKKyAgICBRVGVz dDo6cVdhaXQoMjAwKTsKKworICAgIFFWYXJpYW50IGN1cnJlbnRNaWNyb0ZvY3VzID0gcGFnZS0+ aW5wdXRNZXRob2RRdWVyeShRdDo6SW1NaWNyb0ZvY3VzKTsKKyAgICBRVkVSSUZZKGN1cnJlbnRN aWNyb0ZvY3VzLmlzVmFsaWQoKSk7CisKKyAgICBRQ09NUEFSRShpbml0aWFsTWljcm9Gb2N1cy50 b1JlY3QoKS50cmFuc2xhdGVkKFFQb2ludCgwLC01MCkpLCBjdXJyZW50TWljcm9Gb2N1cy50b1Jl Y3QoKSk7Cit9CisKIFFURVNUX01BSU4odHN0X1FXZWJWaWV3KQogI2luY2x1ZGUgInRzdF9xd2Vi dmlldy5tb2MiCkluZGV4OiBXZWJLaXQvcXQvdGVzdHMvcWdyYXBoaWNzd2Vidmlldy90c3RfcWdy YXBoaWNzd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L3Rlc3RzL3FncmFwaGlj c3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCShyZXZpc2lvbiA1ODAxNSkKKysrIFdl YktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogcHJpdmF0ZSBzbG90czoKICAgICB2b2lk IHFncmFwaGljc3dlYnZpZXcoKTsKICAgICB2b2lkIGNyYXNoT25WaWV3bGVzc1dlYlBhZ2VzKCk7 CisgICAgdm9pZCBtaWNyb0ZvY3VzQ29vcmRpbmF0ZXMoKTsKIH07CiAKIHZvaWQgdHN0X1FHcmFw aGljc1dlYlZpZXc6OnFncmFwaGljc3dlYnZpZXcoKQpAQCAtMTAyLDYgKzEwMyw0MCBAQAogICAg IFFWRVJJRlkod2FpdEZvclNpZ25hbChwYWdlLCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSkp OwogfQogCit2b2lkIHRzdF9RR3JhcGhpY3NXZWJWaWV3OjptaWNyb0ZvY3VzQ29vcmRpbmF0ZXMo KQoreworICAgIFFXZWJQYWdlKiBwYWdlID0gbmV3IFFXZWJQYWdlOworICAgIFFHcmFwaGljc1dl YlZpZXcqIHdlYlZpZXcgPSBuZXcgUUdyYXBoaWNzV2ViVmlldzsKKyAgICB3ZWJWaWV3LT5zZXRQ YWdlKCBwYWdlICk7CisgICAgUUdyYXBoaWNzVmlldyogdmlldyA9IG5ldyBRR3JhcGhpY3NWaWV3 OworICAgIFFHcmFwaGljc1NjZW5lKiBzY2VuZSA9IG5ldyBRR3JhcGhpY3NTY2VuZSh2aWV3KTsK KyAgICB2aWV3LT5zZXRTY2VuZShzY2VuZSk7CisgICAgc2NlbmUtPmFkZEl0ZW0od2ViVmlldyk7 CisgICAgdmlldy0+c2V0R2VvbWV0cnkoUVJlY3QoMCwwLDUwMCw1MDApKTsKKworICAgIHBhZ2Ut Pm1haW5GcmFtZSgpLT5zZXRIdG1sKCI8aHRtbD48Ym9keT4iIFwKKyAgICAgICAgIjxpbnB1dCB0 eXBlPSd0ZXh0JyBpZD0naW5wdXQxJyBzdHlsZT0nZm9udC0tZmFtaWx5OiBzZXJpZicgdmFsdWU9 JycgbWF4bGVuZ3RoPScyMCcvPjxicj4iIFwKKyAgICAgICAgIjxjYW52YXMgaWQ9J2NhbnZhczEn IHdpZHRoPSc1MDAnIGhlaWdodD0nNTAwJy8+IiBcCisgICAgICAgICI8aW5wdXQgdHlwZT0ncGFz c3dvcmQnLz48YnI+IiBcCisgICAgICAgICI8Y2FudmFzIGlkPSdjYW52YXMyJyB3aWR0aD0nNTAw JyBoZWlnaHQ9JzUwMCcvPiIgXAorICAgICAgICAiPC9ib2R5PjwvaHRtbD4iKTsKKworICAgIHBh Z2UtPm1haW5GcmFtZSgpLT5zZXRGb2N1cygpOworCisgICAgUVZhcmlhbnQgaW5pdGlhbE1pY3Jv Rm9jdXMgPSBwYWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbU1pY3JvRm9jdXMpOworICAgIFFW RVJJRlkoaW5pdGlhbE1pY3JvRm9jdXMuaXNWYWxpZCgpKTsKKworICAgIHBhZ2UtPm1haW5GcmFt ZSgpLT5zY3JvbGwoMCwzMDApOworCisgICAgUVZhcmlhbnQgY3VycmVudE1pY3JvRm9jdXMgPSBw YWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbU1pY3JvRm9jdXMpOworICAgIFFWRVJJRlkoY3Vy cmVudE1pY3JvRm9jdXMuaXNWYWxpZCgpKTsKKworICAgIFFDT01QQVJFKGluaXRpYWxNaWNyb0Zv Y3VzLnRvUmVjdCgpLnRyYW5zbGF0ZWQoUVBvaW50KDAsLTMwMCkpLCBjdXJyZW50TWljcm9Gb2N1 cy50b1JlY3QoKSk7CisKKyAgICBkZWxldGUgdmlldzsKK30KKworCiBRVEVTVF9NQUlOKHRzdF9R R3JhcGhpY3NXZWJWaWV3KQogCiAjaW5jbHVkZSAidHN0X3FncmFwaGljc3dlYnZpZXcubW9jIgpJ bmRleDogV2ViS2l0L3F0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQ2hhbmdl TG9nCShyZXZpc2lvbiA1ODEwMikKKysrIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wNC0yMiAgSm9obiBQYXZhbiAgPGpvaG4ucGF2YW5A bm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFtRdF0gUVdlYlBhZ2U6OmlucHV0TWV0aG9kUXVlcnkoUXQ6OkltTWljcm9Gb2N1cykgCisg ICAgICAgIHJldHVybnMgcmVzdWx0cyBpbiB0aGUgY29vcmRpbmF0ZSBzeXN0ZW0gb2YgdGhlIHdl YiBwYWdlLgorICAgICAgICAKKyAgICAgICAgUVdlYlBhZ2U6OmlucHV0TWV0aG9kUXVlcnkgaXMg bW9kaWZpZWQgc28gdGhhdCBpdAorICAgICAgICByZXR1cm5zIGNvb3JkaW5hdGVzIGluIHRoZSB3 aWRnZXQncyBjb29yZGluYXRlIHN5c3RlbS4KKyAgICAgICAgVGVzdHMgYXJlIGFkZGVkIGZvciBR R3JhcGhpY3NXZWJWaWV3IGFuZCBRV2ViVmlldworICAgICAgICB0byB2ZXJpZnkgdGhhdCB0aGlz IGJlaGF2aW9yIGlzIGNvcnJlY3QgYWZ0ZXIgdGhlIHdlYnBhZ2UKKyAgICAgICAgaGFzIGJlZW4g c2Nyb2xsZWQuCisKKyAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBh Z2U6OmlucHV0TWV0aG9kUXVlcnkpOgorICAgICAgICAqIHRlc3RzL3FncmFwaGljc3dlYnZpZXcv dHN0X3FncmFwaGljc3dlYnZpZXcuY3BwOgorICAgICAgICAodHN0X1FHcmFwaGljc1dlYlZpZXc6 Om1pY3JvRm9jdXNDb29yZGluYXRlcyk6CisgICAgICAgICogdGVzdHMvcXdlYnZpZXcvdHN0X3F3 ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHRzdF9RV2ViVmlldzo6bWljcm9Gb2N1c0Nvb3JkaW5hdGVz KToKKwogMjAxMC0wNC0yMiAgSm9jZWx5biBUdXJjb3R0ZSAgPGpvY2VseW4udHVyY290dGVAbm9r aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2Vu LgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3F0L0FwaS9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDU4MDE1KQorKysgV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MzcsNyArMTQzNyw3IEBACiAgICAgICAg ICAgICAgICAgLy8gV2UgY2FuJ3QgYWNjZXNzIGFic29sdXRlQ2FyZXRCb3VuZHMoKSB3aGlsZSB0 aGUgdmlldyBuZWVkcyB0byBsYXlvdXQuCiAgICAgICAgICAgICAgICAgcmV0dXJuIFFWYXJpYW50 KCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICByZXR1cm4gUVZhcmlhbnQoZnJhbWUtPnNl bGVjdGlvbigpLT5hYnNvbHV0ZUNhcmV0Qm91bmRzKCkpOworICAgICAgICAgICAgcmV0dXJuIFFW YXJpYW50KCB2aWV3LT5jb250ZW50c1RvV2luZG93KCBmcmFtZS0+c2VsZWN0aW9uKCktPmFic29s dXRlQ2FyZXRCb3VuZHMoKSApICk7CiAgICAgICAgIH0KICAgICAgICAgY2FzZSBRdDo6SW1Gb250 OiB7CiAgICAgICAgICAgICBpZiAocmVuZGVyVGV4dENvbnRyb2wpIHsK 54099 2010-04-22 14:50:19 -0700 2010-04-22 19:52:30 -0700 Updated changelog file, removed wait 37163.patch text/plain 5148 john.pavan SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTgxMTcpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDQtMjIgIEpvaG4gUGF2YW4gIDxqb2huLnBhdmFu QG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIGlucHV0TWV0aG9kUXVlcnkgcmV0dXJucyBjb29yZGluYXRlcyBpbiB3ZWIgcGFn ZSBjb29yZGluYXRlcyByYXRoZXIgdGhhbiBpbiBpdGVtIGNvb3JkaW5hdGVzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcxNjMKKworCisgICAgICAg IFFXZWJQYWdlOjppbnB1dE1ldGhvZFF1ZXJ5IGlzIG1vZGlmaWVkIHNvIHRoYXQgaXQKKyAgICAg ICAgcmV0dXJucyBjb29yZGluYXRlcyBpbiB0aGUgd2lkZ2V0J3MgY29vcmRpbmF0ZSBzeXN0ZW0u CisgICAgICAgIFRlc3RzIGFyZSBhZGRlZCBmb3IgUUdyYXBoaWNzV2ViVmlldyBhbmQgUVdlYlZp ZXcKKyAgICAgICAgdG8gdmVyaWZ5IHRoYXQgdGhpcyBiZWhhdmlvciBpcyBjb3JyZWN0IGFmdGVy IHRoZSB3ZWJwYWdlCisgICAgICAgIGhhcyBiZWVuIHNjcm9sbGVkLgorCisgICAgICAgICogQXBp L3F3ZWJwYWdlLmNwcDoKKyAgICAgICAgKFFXZWJQYWdlOjppbnB1dE1ldGhvZFF1ZXJ5KToKKyAg ICAgICAgKiB0ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcDoK KyAgICAgICAgKHRzdF9RR3JhcGhpY3NXZWJWaWV3OjptaWNyb0ZvY3VzQ29vcmRpbmF0ZXMpOgor ICAgICAgICAqIHRlc3RzL3F3ZWJ2aWV3L3RzdF9xd2Vidmlldy5jcHA6CisgICAgICAgICh0c3Rf UVdlYlZpZXc6Om1pY3JvRm9jdXNDb29yZGluYXRlcyk6CisKIDIwMTAtMDQtMjIgIFJvYmVydCBI b2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhh dXNtYW5uLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAJKHJldmlzaW9uIDU4MDkwKQorKysgV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMjgsNyArMTMyOCw3IEBAIFFW YXJpYW50IFFXZWJQYWdlOjppbnB1dE1ldGhvZFF1ZXJ5KFF0OjoKICAgICAgICAgICAgICAgICAv LyBXZSBjYW4ndCBhY2Nlc3MgYWJzb2x1dGVDYXJldEJvdW5kcygpIHdoaWxlIHRoZSB2aWV3IG5l ZWRzIHRvIGxheW91dC4KICAgICAgICAgICAgICAgICByZXR1cm4gUVZhcmlhbnQoKTsKICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBRVmFyaWFudChmcmFtZS0+c2VsZWN0aW9uKCkt PmFic29sdXRlQ2FyZXRCb3VuZHMoKSk7CisgICAgICAgICAgICByZXR1cm4gUVZhcmlhbnQodmll dy0+Y29udGVudHNUb1dpbmRvdyhmcmFtZS0+c2VsZWN0aW9uKCktPmFic29sdXRlQ2FyZXRCb3Vu ZHMoKSkpOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgUXQ6OkltRm9udDogewogICAgICAgICAg ICAgaWYgKHJlbmRlclRleHRDb250cm9sKSB7CkluZGV4OiBXZWJLaXQvcXQvdGVzdHMvcWdyYXBo aWNzd2Vidmlldy90c3RfcWdyYXBoaWNzd2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3F0L3Rlc3RzL3FncmFwaGljc3dlYnZpZXcvdHN0X3FncmFwaGljc3dlYnZpZXcuY3BwCShyZXZp c2lvbiA1ODA5MCkKKysrIFdlYktpdC9xdC90ZXN0cy9xZ3JhcGhpY3N3ZWJ2aWV3L3RzdF9xZ3Jh cGhpY3N3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQCBjbGFzcyB0 c3RfUUdyYXBoaWNzV2ViVmlldyA6IHB1YmxpYyBRT2JqCiBwcml2YXRlIHNsb3RzOgogICAgIHZv aWQgcWdyYXBoaWNzd2VidmlldygpOwogICAgIHZvaWQgY3Jhc2hPblZpZXdsZXNzV2ViUGFnZXMo KTsKKyAgICB2b2lkIG1pY3JvRm9jdXNDb29yZGluYXRlcygpOwogfTsKIAogdm9pZCB0c3RfUUdy YXBoaWNzV2ViVmlldzo6cWdyYXBoaWNzd2VidmlldygpCkBAIC0xMDIsNiArMTAzLDQwIEBAIHZv aWQgdHN0X1FHcmFwaGljc1dlYlZpZXc6OmNyYXNoT25WaWV3bGUKICAgICBRVkVSSUZZKHdhaXRG b3JTaWduYWwocGFnZSwgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpKTsKIH0KIAordm9pZCB0 c3RfUUdyYXBoaWNzV2ViVmlldzo6bWljcm9Gb2N1c0Nvb3JkaW5hdGVzKCkKK3sKKyAgICBRV2Vi UGFnZSogcGFnZSA9IG5ldyBRV2ViUGFnZTsKKyAgICBRR3JhcGhpY3NXZWJWaWV3KiB3ZWJWaWV3 ID0gbmV3IFFHcmFwaGljc1dlYlZpZXc7CisgICAgd2ViVmlldy0+c2V0UGFnZSggcGFnZSApOwor ICAgIFFHcmFwaGljc1ZpZXcqIHZpZXcgPSBuZXcgUUdyYXBoaWNzVmlldzsKKyAgICBRR3JhcGhp Y3NTY2VuZSogc2NlbmUgPSBuZXcgUUdyYXBoaWNzU2NlbmUodmlldyk7CisgICAgdmlldy0+c2V0 U2NlbmUoc2NlbmUpOworICAgIHNjZW5lLT5hZGRJdGVtKHdlYlZpZXcpOworICAgIHZpZXctPnNl dEdlb21ldHJ5KFFSZWN0KDAsMCw1MDAsNTAwKSk7CisKKyAgICBwYWdlLT5tYWluRnJhbWUoKS0+ c2V0SHRtbCgiPGh0bWw+PGJvZHk+IiBcCisgICAgICAgICI8aW5wdXQgdHlwZT0ndGV4dCcgaWQ9 J2lucHV0MScgc3R5bGU9J2ZvbnQtLWZhbWlseTogc2VyaWYnIHZhbHVlPScnIG1heGxlbmd0aD0n MjAnLz48YnI+IiBcCisgICAgICAgICI8Y2FudmFzIGlkPSdjYW52YXMxJyB3aWR0aD0nNTAwJyBo ZWlnaHQ9JzUwMCcvPiIgXAorICAgICAgICAiPGlucHV0IHR5cGU9J3Bhc3N3b3JkJy8+PGJyPiIg XAorICAgICAgICAiPGNhbnZhcyBpZD0nY2FudmFzMicgd2lkdGg9JzUwMCcgaGVpZ2h0PSc1MDAn Lz4iIFwKKyAgICAgICAgIjwvYm9keT48L2h0bWw+Iik7CisKKyAgICBwYWdlLT5tYWluRnJhbWUo KS0+c2V0Rm9jdXMoKTsKKworICAgIFFWYXJpYW50IGluaXRpYWxNaWNyb0ZvY3VzID0gcGFnZS0+ aW5wdXRNZXRob2RRdWVyeShRdDo6SW1NaWNyb0ZvY3VzKTsKKyAgICBRVkVSSUZZKGluaXRpYWxN aWNyb0ZvY3VzLmlzVmFsaWQoKSk7CisKKyAgICBwYWdlLT5tYWluRnJhbWUoKS0+c2Nyb2xsKDAs MzAwKTsKKworICAgIFFWYXJpYW50IGN1cnJlbnRNaWNyb0ZvY3VzID0gcGFnZS0+aW5wdXRNZXRo b2RRdWVyeShRdDo6SW1NaWNyb0ZvY3VzKTsKKyAgICBRVkVSSUZZKGN1cnJlbnRNaWNyb0ZvY3Vz LmlzVmFsaWQoKSk7CisKKyAgICBRQ09NUEFSRShpbml0aWFsTWljcm9Gb2N1cy50b1JlY3QoKS50 cmFuc2xhdGVkKFFQb2ludCgwLC0zMDApKSwgY3VycmVudE1pY3JvRm9jdXMudG9SZWN0KCkpOwor CisgICAgZGVsZXRlIHZpZXc7Cit9CisKKwogUVRFU1RfTUFJTih0c3RfUUdyYXBoaWNzV2ViVmll dykKIAogI2luY2x1ZGUgInRzdF9xZ3JhcGhpY3N3ZWJ2aWV3Lm1vYyIKSW5kZXg6IFdlYktpdC9x dC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9x dC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCShyZXZpc2lvbiA1ODA5MCkKKysrIFdl YktpdC9xdC90ZXN0cy9xd2Vidmlldy90c3RfcXdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00OCw2ICs0OCw3IEBAIHByaXZhdGUgc2xvdHM6CiAKICAgICB2b2lkIHJldXNlUGFnZV9kYXRh KCk7CiAgICAgdm9pZCByZXVzZVBhZ2UoKTsKKyAgICB2b2lkIG1pY3JvRm9jdXNDb29yZGluYXRl cygpOwogCiAgICAgdm9pZCBjcmFzaFRlc3RzKCk7CiB9OwpAQCAtMjAzLDYgKzIwNCwzMSBAQCB2 b2lkIHRzdF9RV2ViVmlldzo6Y3Jhc2hUZXN0cygpCiAgICAgUVRSWV9WRVJJRlkodGVzdGVyLm1f ZXhlY3V0ZWQpOyAvLyBJZiBmYWlsIGl0IG1lYW5zIHRoYXQgdGhlIHRlc3Qgd2Fzbid0IGV4ZWN1 dGVkLgogfQogCit2b2lkIHRzdF9RV2ViVmlldzo6bWljcm9Gb2N1c0Nvb3JkaW5hdGVzKCkKK3sK KyAgICBRV2ViUGFnZSogcGFnZSA9IG5ldyBRV2ViUGFnZTsKKyAgICBRV2ViVmlldyogd2ViVmll dyA9IG5ldyBRV2ViVmlldzsKKyAgICB3ZWJWaWV3LT5zZXRQYWdlKCBwYWdlICk7CisKKyAgICBw YWdlLT5tYWluRnJhbWUoKS0+c2V0SHRtbCgiPGh0bWw+PGJvZHk+IiBcCisgICAgICAgICI8aW5w dXQgdHlwZT0ndGV4dCcgaWQ9J2lucHV0MScgc3R5bGU9J2ZvbnQtLWZhbWlseTogc2VyaWYnIHZh bHVlPScnIG1heGxlbmd0aD0nMjAnLz48YnI+IiBcCisgICAgICAgICI8Y2FudmFzIGlkPSdjYW52 YXMxJyB3aWR0aD0nNTAwJyBoZWlnaHQ9JzUwMCcvPiIgXAorICAgICAgICAiPGlucHV0IHR5cGU9 J3Bhc3N3b3JkJy8+PGJyPiIgXAorICAgICAgICAiPGNhbnZhcyBpZD0nY2FudmFzMicgd2lkdGg9 JzUwMCcgaGVpZ2h0PSc1MDAnLz4iIFwKKyAgICAgICAgIjwvYm9keT48L2h0bWw+Iik7CisKKyAg ICBwYWdlLT5tYWluRnJhbWUoKS0+c2V0Rm9jdXMoKTsKKworICAgIFFWYXJpYW50IGluaXRpYWxN aWNyb0ZvY3VzID0gcGFnZS0+aW5wdXRNZXRob2RRdWVyeShRdDo6SW1NaWNyb0ZvY3VzKTsKKyAg ICBRVkVSSUZZKGluaXRpYWxNaWNyb0ZvY3VzLmlzVmFsaWQoKSk7CisKKyAgICBwYWdlLT5tYWlu RnJhbWUoKS0+c2Nyb2xsKDAsNTApOworCisgICAgUVZhcmlhbnQgY3VycmVudE1pY3JvRm9jdXMg PSBwYWdlLT5pbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbU1pY3JvRm9jdXMpOworICAgIFFWRVJJRlko Y3VycmVudE1pY3JvRm9jdXMuaXNWYWxpZCgpKTsKKworICAgIFFDT01QQVJFKGluaXRpYWxNaWNy b0ZvY3VzLnRvUmVjdCgpLnRyYW5zbGF0ZWQoUVBvaW50KDAsLTUwKSksIGN1cnJlbnRNaWNyb0Zv Y3VzLnRvUmVjdCgpKTsKK30KIAogUVRFU1RfTUFJTih0c3RfUVdlYlZpZXcpCiAjaW5jbHVkZSAi dHN0X3F3ZWJ2aWV3Lm1vYyIK