34884 2010-02-12 03:01:39 -0800 [Qt] QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters 2011-09-10 06:15:01 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Major --- 1 levgolod webkit-unassigned benjamin cmarcelo diegohcg hausmann tonikitoo tracy.rees webkit.review.bot zuh oldest_to_newest 189995 0 levgolod 2010-02-12 03:01:39 -0800 When QWebSettings::setUserStyleSheetUrl() is used to set user style sheet nothing happens. It starts from Qt 4.6.0 Qt 4.5.x works correctly. To reproduce it's possible to start Qt demo Browser and setup style sheet URL in Edit -> Preferences -> Advanced -> Style Sheet 196725 1 benjamin 2010-03-05 15:16:29 -0800 That seems broken as well with Qt 4.7. 196999 2 tonikitoo 2010-03-07 05:51:55 -0800 I remember diego playing w/ this stuff. Diegou could you please verify if it is a dup of the bug you solved or a real problem ? if the later, a diagnostic would be great 197153 3 hausmann 2010-03-08 07:23:05 -0800 This works for me. Note that you can only specify a path to a local file or a base64 encoded url. From the documentation: /*! Specifies the location of a user stylesheet to load with every web page. The \a location must be either a path on the local filesystem, or a data URL with UTF-8 and Base64 encoded data, such as: "data:text/css;charset=utf-8;base64,cCB7IGJhY2tncm91bmQtY29sb3I6IHJlZCB9Ow==" \sa userStyleSheetUrl() */ 202001 4 tracy.rees 2010-03-19 13:01:52 -0700 It seems that "The location must be either a path on the local filesystem" does not work. I've tried very hard on 4.6.2 and it just doesn't work. 202030 5 benjamin 2010-03-19 14:09:25 -0700 Could(In reply to comment #4) > It seems that > "The location must be either a path on the local filesystem" does not work. > > I've tried very hard on 4.6.2 and it just doesn't work. Could you please attach a simple test case to reproduce the problem? So we can quickly check if something is wrong is your code or in WebKit? 202195 6 levgolod 2010-03-20 01:52:38 -0700 #include <QtGui/QApplication> #include <QWebView> #include <QUrl> int main(int argc, char *argv[]) { QApplication a(argc, argv); QWebView view; QByteArray css("div { background-color: red }"); // that's works fine //view.settings()->setUserStyleSheetUrl(QUrl("data:text/css;charset=utf-8;base64," + css.toBase64())); // doesn't work view.settings()->setUserStyleSheetUrl(QUrl::fromLocalFile("d:/test.css")); view.load(QUrl("http://qtsoftware.com/")); view.show(); return a.exec(); } It seems like String KURL::fileSystemPath() const returns "/d:/test.css" that QFileInfo can't understand. 202372 7 hausmann 2010-03-21 16:27:06 -0700 (In reply to comment #6) > #include <QtGui/QApplication> > #include <QWebView> > #include <QUrl> > > int main(int argc, char *argv[]) > { > QApplication a(argc, argv); > QWebView view; > QByteArray css("div { background-color: red }"); > > // that's works fine > > //view.settings()->setUserStyleSheetUrl(QUrl("data:text/css;charset=utf-8;base64," > + css.toBase64())); > > // doesn't work > view.settings()->setUserStyleSheetUrl(QUrl::fromLocalFile("d:/test.css")); > > view.load(QUrl("http://qtsoftware.com/")); > view.show(); > return a.exec(); > } > > It seems like > String KURL::fileSystemPath() const > returns "/d:/test.css" that QFileInfo can't understand. Well spotted. It seems KURL::fileSystemPath() should use toLocalFile() instead of simply path(). 202374 8 hausmann 2010-03-21 16:29:30 -0700 (In reply to comment #7) > Well spotted. It seems KURL::fileSystemPath() should use toLocalFile() instead > of simply path(). Which argh isn't correct either. QUrl::toLocalFile() will return an empty string if the scheme is qrc (or != file && !isEmpty(). Looks like we need a special case and a unit test. 202632 9 zuh 2010-03-22 11:19:54 -0700 (In reply to comment #8) > (In reply to comment #7) > > Well spotted. It seems KURL::fileSystemPath() should use toLocalFile() instead > > of simply path(). > > Which argh isn't correct either. QUrl::toLocalFile() will return an empty > string if the scheme is qrc (or != file && !isEmpty(). > > Looks like we need a special case and a unit test. For what it's worth, the example doesn't work on Linux either, with a seemingly valid file URL: QUrl( "file:///tmp/test.css" ) 202646 10 diegohcg 2010-03-22 11:40:46 -0700 > For what it's worth, the example doesn't work on Linux either, with a seemingly > valid file URL: > QUrl( "file:///tmp/test.css" ) Actually it works in this case since r53276. Which WebKit revision are you using? 203002 11 zuh 2010-03-23 05:27:52 -0700 (In reply to comment #10) > > For what it's worth, the example doesn't work on Linux either, with a seemingly > > valid file URL: > > QUrl( "file:///tmp/test.css" ) > > Actually it works in this case since r53276. Which WebKit revision are you > using? Apparently something before that, from the 4.6.1 Qt release. Checking the changeset confirms that I don't have that change here, so sorry for the noise :) 322973 12 76715 jarred 2010-12-15 17:29:30 -0800 Created attachment 76715 Proposed patch QUrl::toLocalFile() is perfectly sufficient right here. KURL::path() returns a extra leading slash for Windows file URIs, but QUrl::toLocalFile() will handle these well. A separate bug will be filed for allowing style sheet files as qrc resource URIs, which involves changing WebCore/page/Page.cpp. 323941 13 76715 webkit.review.bot 2010-12-17 12:51:35 -0800 Comment on attachment 76715 Proposed patch Rejecting attachment 76715 from review queue. jarred.nicholls@gmail.com does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 323944 14 76715 webkit.review.bot 2010-12-17 12:53:28 -0800 Comment on attachment 76715 Proposed patch Rejecting attachment 76715 from commit-queue. jarred.nicholls@gmail.com does not have committer permissions according to http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in WebKitTools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 324107 15 76715 kling 2010-12-18 07:39:42 -0800 Comment on attachment 76715 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=76715&action=review > WebCore/ChangeLog:10 > + No new tests added. Why not? > WebCore/platform/qt/KURLQt.cpp:3 > + * Copyright (C) 2010 Sencha, Inc. All rights reserved. This change is a bit too skinny to warrant a copyright line. :-) 324126 16 tonikitoo 2010-12-18 12:09:01 -0800 > > WebCore/platform/qt/KURLQt.cpp:3 > > + * Copyright (C) 2010 Sencha, Inc. All rights reserved. > > This change is a bit too skinny to warrant a copyright line. :-) Although I agree with you, kling, any change can warrant a copyright addition, so it is up to the developer, but definitively he is not wrong. 464984 17 106905 jarred 2011-09-09 12:40:30 -0700 Created attachment 106905 Proposed Patch 465009 18 106915 jarred 2011-09-09 13:46:25 -0700 Created attachment 106915 Proposed Patch 465278 19 106915 kling 2011-09-10 03:59:00 -0700 Comment on attachment 106915 Proposed Patch Great! 465285 20 106915 webkit.review.bot 2011-09-10 06:14:55 -0700 Comment on attachment 106915 Proposed Patch Clearing flags on attachment: 106915 Committed r94906: <http://trac.webkit.org/changeset/94906> 465286 21 webkit.review.bot 2011-09-10 06:15:01 -0700 All reviewed patches have been landed. Closing bug. 76715 2010-12-15 17:29:30 -0800 2011-09-09 12:40:30 -0700 Proposed patch stylesheet-winpath.patch text/plain 1363 jarred ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTI1YjJlMy4uZjhjZjA2YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMi0xNSAgSmFycmVkIE5pY2hv bGxzICA8amFycmVkQHNlbmNoYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgW1F0XSBRV2ViU2V0dGluZ3M6OnNldFVzZXJTdHlsZVNoZWV0VXJs KCkgZG9lcyBub3Qgd29yayB3aXRoIHdpbmRvd3MgcGF0aHMgdGhhdCBjb250YWluIGRyaXZlIGxl dHRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0 ODg0CisgICAgICAgIAorICAgICAgICBVdGlsaXplIFFVcmw6OnRvTG9jYWxGaWxlKCkgdG8gcHJv cGVybHkgaGFuZGxlIFdpbmRvd3MgZmlsZSBVUklzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBh ZGRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L0tVUkxRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpLVVJMOjpmaWxlU3lzdGVtUGF0aCk6CisKIDIwMTAtMTItMTUgIE1hdHRoZXcgRGVsYW5l eSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFz ZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3F0L0tVUkxRdC5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL3F0L0tVUkxRdC5jcHAKaW5kZXggZjZkMmE4Ni4uZDMxMDQ0YSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9LVVJMUXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v cXQvS1VSTFF0LmNwcApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDgg Tm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJzaWRpYXJ5KC1pZXMpCisgKiBDb3B5cmln aHQgKEMpIDIwMTAgU2VuY2hhLCBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogVGhp cyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v cgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJh bCBQdWJsaWMKQEAgLTQ2LDcgKzQ3LDcgQEAgU3RyaW5nIEtVUkw6OmZpbGVTeXN0ZW1QYXRoKCkg Y29uc3QKICAgICBpZiAoIWlzVmFsaWQoKSB8fCAhcHJvdG9jb2xJcygiZmlsZSIpKQogICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CiAKLSAgICByZXR1cm4gU3RyaW5nKHBhdGgoKSk7CisgICAgcmV0 dXJuIHN0YXRpY19jYXN0PFFVcmw+KCp0aGlzKS50b0xvY2FsRmlsZSgpOwogfQogCiB9Cg== 106905 2011-09-09 12:40:30 -0700 2011-09-09 13:46:25 -0700 Proposed Patch 34884.patch text/plain 4080 jarred ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4M2Q3ZjBiLi43YWMyNjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDktMDkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisg ICAgICAgIFtRdF0gUVdlYlNldHRpbmdzOjpzZXRVc2VyU3R5bGVTaGVldFVybCgpIGRvZXMgbm90 IHdvcmsgd2l0aCB3aW5kb3dzIHBhdGhzIHRoYXQgY29udGFpbiBkcml2ZSBsZXR0ZXJzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDg4NAorICAgICAg ICAKKyAgICAgICAgS1VSTDo6cGF0aCgpIGFsb25lIGRvZXMgbm90IGhhbmRsZSByZW1vdmluZyB0 aGUgbGVhZGluZyBzbGFzaCBmcm9tIGEgd2luZG93cyBmaWxlIHBhdGguCisgICAgICAgIFVzaW5n IFFVcmw6OnRvTG9jYWxGaWxlKCkgd2lsbCB0dXJuIGZpbGU6Ly8vQzovcGF0aCBpbnRvIEM6L3Bh dGggYXBwcm9wcmlhdGVseS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIHBsYXRmb3JtL3F0 L0tVUkxRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLVVJMOjpmaWxlU3lzdGVtUGF0aCk6CisK IDIwMTEtMDktMDggIEtlbnRhcm8gSGFyYSAgPGhhcmFrZW5AZ29vZ2xlLmNvbT4KIAogICAgICAg ICBJbXBsZW1lbnQgYSBXZWJLaXRBbmltYXRpb25FdmVudCBjb25zdHJ1Y3Rvci4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0tVUkxRdC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9xdC9LVVJMUXQuY3BwCmluZGV4IGY2ZDJhODYuLjQ5ZGY1OWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0tVUkxRdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vcXQvS1VSTFF0LmNwcApAQCAtNDYsNyArNDYsNyBAQCBTdHJpbmcgS1VS TDo6ZmlsZVN5c3RlbVBhdGgoKSBjb25zdAogICAgIGlmICghaXNWYWxpZCgpIHx8ICFwcm90b2Nv bElzKCJmaWxlIikpCiAgICAgICAgIHJldHVybiBTdHJpbmcoKTsKIAotICAgIHJldHVybiBTdHJp bmcocGF0aCgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8UVVybD4oKnRoaXMpLnRvTG9jYWxG aWxlKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggNGE5N2M3NS4uNTY0MWFjYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9xdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wOS0wOSAgSmFycmVkIE5pY2hvbGxzICA8 amFycmVkQHNlbmNoYS5jb20+CisKKyAgICAgICAgW1F0XSBRV2ViU2V0dGluZ3M6OnNldFVzZXJT dHlsZVNoZWV0VXJsKCkgZG9lcyBub3Qgd29yayB3aXRoIHdpbmRvd3MgcGF0aHMgdGhhdCBjb250 YWluIGRyaXZlIGxldHRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM0ODg0CisgICAgICAgIAorICAgICAgICBLVVJMOjpwYXRoKCkgYWxvbmUgZG9l cyBub3QgaGFuZGxlIHJlbW92aW5nIHRoZSBsZWFkaW5nIHNsYXNoIGZyb20gYSB3aW5kb3dzIGZp bGUgcGF0aC4KKyAgICAgICAgVXNpbmcgUVVybDo6dG9Mb2NhbEZpbGUoKSB3aWxsIHR1cm4gZmls ZTovLy9DOi9wYXRoIGludG8gQzovcGF0aCBhcHByb3ByaWF0ZWx5LgorICAgICAgICAKKyAgICAg ICAgTmV3IHRlc3QgY2FzZSB0aGF0IGVuc3VyZXMgYSB1c2VyIHN0eWxlc2hlZXQgZnJvbSB0aGUg ZmlsZSBzeXN0ZW0gd2lsbCBsb2FkIGNvcnJlY3RseQorICAgICAgICBvbiBhbGwgcGxhdGZvcm1z LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVz dHMvcXdlYnBhZ2UvcmVzb3VyY2VzL3VzZXIuY3NzOiBBZGRlZC4KKyAgICAgICAgKHApOgorICAg ICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CisgICAgICAgICh0c3RfUVdl YlBhZ2U6OnVzZXJTdHlsZVNoZWV0RnJvbUZpbGUpOgorCiAyMDExLTA5LTA5ICBaZW5vIEFsYmlz c2VyICA8emVuby5hbGJpc3NlckBub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBRV2ViRWxlbWVu dDo6ZW5jbG9zZVdpdGggZG9lc24ndCB3b3JrIGF0IGFsbApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9xdC90ZXN0cy9xd2VicGFnZS9yZXNvdXJjZXMvdXNlci5jc3MgYi9Tb3VyY2UvV2ViS2l0 L3F0L3Rlc3RzL3F3ZWJwYWdlL3Jlc291cmNlcy91c2VyLmNzcwpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi40Y2NiMmYwCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYktp dC9xdC90ZXN0cy9xd2VicGFnZS9yZXNvdXJjZXMvdXNlci5jc3MKQEAgLTAsMCArMSwzIEBACitw IHsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2h0dHA6Ly9kb2VzLm5vdC9leGlzdC5wbmcn KTsKK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0 L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAKaW5kZXggNTUyZjBiZi4uNGQyNWM1NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNw cApAQCAtMTAxLDYgKzEwMSw3IEBAIHByaXZhdGUgc2xvdHM6CiAgICAgdm9pZCBwb3B1cEZvcm1T dWJtaXNzaW9uKCk7CiAgICAgdm9pZCBhY2NlcHROYXZpZ2F0aW9uUmVxdWVzdFdpdGhOZXdXaW5k b3coKTsKICAgICB2b2lkIHVzZXJTdHlsZVNoZWV0KCk7CisgICAgdm9pZCB1c2VyU3R5bGVTaGVl dEZyb21GaWxlKCk7CiAgICAgdm9pZCBsb2FkSHRtbDVWaWRlbygpOwogICAgIHZvaWQgbW9kaWZp ZWQoKTsKICAgICB2b2lkIGNvbnRleHRNZW51Q3Jhc2goKTsKQEAgLTQ3Niw2ICs0NzcsMjEgQEAg dm9pZCB0c3RfUVdlYlBhZ2U6OnVzZXJTdHlsZVNoZWV0KCkKICAgICBRQ09NUEFSRShuZXR3b3Jr TWFuYWdlci0+cmVxdWVzdGVkVXJscy5hdCgwKSwgUVVybCgiaHR0cDovL2RvZXMubm90L2V4aXN0 LnBuZyIpKTsKIH0KIAordm9pZCB0c3RfUVdlYlBhZ2U6OnVzZXJTdHlsZVNoZWV0RnJvbUZpbGUo KQoreworICAgIFRlc3ROZXR3b3JrTWFuYWdlciogbmV0d29ya01hbmFnZXIgPSBuZXcgVGVzdE5l dHdvcmtNYW5hZ2VyKG1fcGFnZSk7CisgICAgbV9wYWdlLT5zZXROZXR3b3JrQWNjZXNzTWFuYWdl cihuZXR3b3JrTWFuYWdlcik7CisgICAgbmV0d29ya01hbmFnZXItPnJlcXVlc3RlZFVybHMuY2xl YXIoKTsKKworICAgIFFVcmwgc3R5bGVTaGVldFVybCA9IFFVcmw6OmZyb21Mb2NhbEZpbGUoVEVT VFNfU09VUkNFX0RJUiArIFFMYXRpbjFTdHJpbmcoInF3ZWJwYWdlL3Jlc291cmNlcy91c2VyLmNz cyIpKTsKKyAgICBtX3BhZ2UtPnNldHRpbmdzKCktPnNldFVzZXJTdHlsZVNoZWV0VXJsKHN0eWxl U2hlZXRVcmwpOworICAgIG1fdmlldy0+c2V0SHRtbCgiPHA+aGVsbG8gd29ybGQ8L3A+Iik7Cisg ICAgUVZFUklGWSg6OndhaXRGb3JTaWduYWwobV92aWV3LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJv b2wpKSkpOworCisgICAgUVZFUklGWShuZXR3b3JrTWFuYWdlci0+cmVxdWVzdGVkVXJscy5jb3Vu dCgpID49IDEpOworICAgIFFDT01QQVJFKG5ldHdvcmtNYW5hZ2VyLT5yZXF1ZXN0ZWRVcmxzLmF0 KDApLCBRVXJsKCJodHRwOi8vZG9lcy5ub3QvZXhpc3QucG5nIikpOworfQorCiB2b2lkIHRzdF9R V2ViUGFnZTo6bG9hZEh0bWw1VmlkZW8oKQogewogI2lmIGRlZmluZWQoV1RGX1VTRV9RVF9NVUxU SU1FRElBKSAmJiBXVEZfVVNFX1FUX01VTFRJTUVESUEK 106915 2011-09-09 13:46:25 -0700 2011-09-10 06:14:55 -0700 Proposed Patch 34884.patch text/plain 4441 jarred ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4M2Q3ZjBiLi5mYmU2OWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDktMDkgIEphcnJlZCBOaWNob2xscyAgPGphcnJlZEBzZW5jaGEuY29tPgorCisg ICAgICAgIFtRdF0gUVdlYlNldHRpbmdzOjpzZXRVc2VyU3R5bGVTaGVldFVybCgpIGRvZXMgbm90 IHdvcmsgd2l0aCB3aW5kb3dzIHBhdGhzIHRoYXQgY29udGFpbiBkcml2ZSBsZXR0ZXJzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDg4NAorICAgICAg ICAKKyAgICAgICAgS1VSTDo6cGF0aCgpIGFsb25lIGRvZXMgbm90IGhhbmRsZSByZW1vdmluZyB0 aGUgbGVhZGluZyBzbGFzaCBmcm9tIGEgd2luZG93cyBmaWxlIHBhdGguCisgICAgICAgIFVzaW5n IFFVcmw6OnRvTG9jYWxGaWxlKCkgd2lsbCB0dXJuIGZpbGU6Ly8vQzovcGF0aCBpbnRvIEM6L3Bh dGggYXBwcm9wcmlhdGVseS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHBsYXRmb3JtL3F0L0tVUkxRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpL VVJMOjpmaWxlU3lzdGVtUGF0aCk6CisKIDIwMTEtMDktMDggIEtlbnRhcm8gSGFyYSAgPGhhcmFr ZW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgYSBXZWJLaXRBbmltYXRpb25FdmVu dCBjb25zdHJ1Y3Rvci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0tV UkxRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9xdC9LVVJMUXQuY3BwCmluZGV4IGY2 ZDJhODYuLjQ5ZGY1OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3F0L0tV UkxRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vcXQvS1VSTFF0LmNwcApAQCAt NDYsNyArNDYsNyBAQCBTdHJpbmcgS1VSTDo6ZmlsZVN5c3RlbVBhdGgoKSBjb25zdAogICAgIGlm ICghaXNWYWxpZCgpIHx8ICFwcm90b2NvbElzKCJmaWxlIikpCiAgICAgICAgIHJldHVybiBTdHJp bmcoKTsKIAotICAgIHJldHVybiBTdHJpbmcocGF0aCgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nh c3Q8UVVybD4oKnRoaXMpLnRvTG9jYWxGaWxlKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg NGE5N2M3NS4uNTY0MWFjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0w OS0wOSAgSmFycmVkIE5pY2hvbGxzICA8amFycmVkQHNlbmNoYS5jb20+CisKKyAgICAgICAgW1F0 XSBRV2ViU2V0dGluZ3M6OnNldFVzZXJTdHlsZVNoZWV0VXJsKCkgZG9lcyBub3Qgd29yayB3aXRo IHdpbmRvd3MgcGF0aHMgdGhhdCBjb250YWluIGRyaXZlIGxldHRlcnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM0ODg0CisgICAgICAgIAorICAgICAg ICBLVVJMOjpwYXRoKCkgYWxvbmUgZG9lcyBub3QgaGFuZGxlIHJlbW92aW5nIHRoZSBsZWFkaW5n IHNsYXNoIGZyb20gYSB3aW5kb3dzIGZpbGUgcGF0aC4KKyAgICAgICAgVXNpbmcgUVVybDo6dG9M b2NhbEZpbGUoKSB3aWxsIHR1cm4gZmlsZTovLy9DOi9wYXRoIGludG8gQzovcGF0aCBhcHByb3By aWF0ZWx5LgorICAgICAgICAKKyAgICAgICAgTmV3IHRlc3QgY2FzZSB0aGF0IGVuc3VyZXMgYSB1 c2VyIHN0eWxlc2hlZXQgZnJvbSB0aGUgZmlsZSBzeXN0ZW0gd2lsbCBsb2FkIGNvcnJlY3RseQor ICAgICAgICBvbiBhbGwgcGxhdGZvcm1zLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogdGVzdHMvcXdlYnBhZ2UvcmVzb3VyY2VzL3VzZXIuY3NzOiBB ZGRlZC4KKyAgICAgICAgKHApOgorICAgICAgICAqIHRlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFn ZS5jcHA6CisgICAgICAgICh0c3RfUVdlYlBhZ2U6OnVzZXJTdHlsZVNoZWV0RnJvbUZpbGUpOgor CiAyMDExLTA5LTA5ICBaZW5vIEFsYmlzc2VyICA8emVuby5hbGJpc3NlckBub2tpYS5jb20+CiAK ICAgICAgICAgW1F0XSBRV2ViRWxlbWVudDo6ZW5jbG9zZVdpdGggZG9lc24ndCB3b3JrIGF0IGFs bApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS9yZXNvdXJjZXMv dXNlci5jc3MgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3Jlc291cmNlcy91c2Vy LmNzcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40Y2NiMmYwCi0tLSAvZGV2 L251bGwKKysrIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9xd2VicGFnZS9yZXNvdXJjZXMvdXNl ci5jc3MKQEAgLTAsMCArMSwzIEBACitwIHsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2h0 dHA6Ly9kb2VzLm5vdC9leGlzdC5wbmcnKTsKK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFn ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAK aW5kZXggNTUyZjBiZi4uZDA2M2Y4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9xdC90ZXN0 cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMv cXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAtMTAxLDYgKzEwMSw3IEBAIHByaXZhdGUgc2xv dHM6CiAgICAgdm9pZCBwb3B1cEZvcm1TdWJtaXNzaW9uKCk7CiAgICAgdm9pZCBhY2NlcHROYXZp Z2F0aW9uUmVxdWVzdFdpdGhOZXdXaW5kb3coKTsKICAgICB2b2lkIHVzZXJTdHlsZVNoZWV0KCk7 CisgICAgdm9pZCB1c2VyU3R5bGVTaGVldEZyb21Mb2NhbEZpbGVVcmwoKTsKICAgICB2b2lkIGxv YWRIdG1sNVZpZGVvKCk7CiAgICAgdm9pZCBtb2RpZmllZCgpOwogICAgIHZvaWQgY29udGV4dE1l bnVDcmFzaCgpOwpAQCAtNDY1LDcgKzQ2Niw2IEBAIHZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyU3R5 bGVTaGVldCgpCiB7CiAgICAgVGVzdE5ldHdvcmtNYW5hZ2VyKiBuZXR3b3JrTWFuYWdlciA9IG5l dyBUZXN0TmV0d29ya01hbmFnZXIobV9wYWdlKTsKICAgICBtX3BhZ2UtPnNldE5ldHdvcmtBY2Nl c3NNYW5hZ2VyKG5ldHdvcmtNYW5hZ2VyKTsKLSAgICBuZXR3b3JrTWFuYWdlci0+cmVxdWVzdGVk VXJscy5jbGVhcigpOwogCiAgICAgbV9wYWdlLT5zZXR0aW5ncygpLT5zZXRVc2VyU3R5bGVTaGVl dFVybChRVXJsKCJkYXRhOnRleHQvY3NzO2NoYXJzZXQ9dXRmLTg7YmFzZTY0LCIKICAgICAgICAg ICAgICsgUUJ5dGVBcnJheSgicCB7IGJhY2tncm91bmQtaW1hZ2U6IHVybCgnaHR0cDovL2RvZXMu bm90L2V4aXN0LnBuZycpO30iKS50b0Jhc2U2NCgpKSk7CkBAIC00NzYsNiArNDc2LDIwIEBAIHZv aWQgdHN0X1FXZWJQYWdlOjp1c2VyU3R5bGVTaGVldCgpCiAgICAgUUNPTVBBUkUobmV0d29ya01h bmFnZXItPnJlcXVlc3RlZFVybHMuYXQoMCksIFFVcmwoImh0dHA6Ly9kb2VzLm5vdC9leGlzdC5w bmciKSk7CiB9CiAKK3ZvaWQgdHN0X1FXZWJQYWdlOjp1c2VyU3R5bGVTaGVldEZyb21Mb2NhbEZp bGVVcmwoKQoreworICAgIFRlc3ROZXR3b3JrTWFuYWdlciogbmV0d29ya01hbmFnZXIgPSBuZXcg VGVzdE5ldHdvcmtNYW5hZ2VyKG1fcGFnZSk7CisgICAgbV9wYWdlLT5zZXROZXR3b3JrQWNjZXNz TWFuYWdlcihuZXR3b3JrTWFuYWdlcik7CisKKyAgICBRVXJsIHN0eWxlU2hlZXRVcmwgPSBRVXJs Ojpmcm9tTG9jYWxGaWxlKFRFU1RTX1NPVVJDRV9ESVIgKyBRTGF0aW4xU3RyaW5nKCJxd2VicGFn ZS9yZXNvdXJjZXMvdXNlci5jc3MiKSk7CisgICAgbV9wYWdlLT5zZXR0aW5ncygpLT5zZXRVc2Vy U3R5bGVTaGVldFVybChzdHlsZVNoZWV0VXJsKTsKKyAgICBtX3ZpZXctPnNldEh0bWwoIjxwPmhl bGxvIHdvcmxkPC9wPiIpOworICAgIFFWRVJJRlkoOjp3YWl0Rm9yU2lnbmFsKG1fdmlldywgU0lH TkFMKGxvYWRGaW5pc2hlZChib29sKSkpKTsKKworICAgIFFWRVJJRlkobmV0d29ya01hbmFnZXIt PnJlcXVlc3RlZFVybHMuY291bnQoKSA+PSAxKTsKKyAgICBRQ09NUEFSRShuZXR3b3JrTWFuYWdl ci0+cmVxdWVzdGVkVXJscy5hdCgwKSwgUVVybCgiaHR0cDovL2RvZXMubm90L2V4aXN0LnBuZyIp KTsKK30KKwogdm9pZCB0c3RfUVdlYlBhZ2U6OmxvYWRIdG1sNVZpZGVvKCkKIHsKICNpZiBkZWZp bmVkKFdURl9VU0VfUVRfTVVMVElNRURJQSkgJiYgV1RGX1VTRV9RVF9NVUxUSU1FRElBCg==