50189 2010-11-29 16:40:43 -0800 [chromium] ContentLayerChromium shader should honor the platform Sk_x_SHIFT value instead of assuming BGRA color 2010-12-01 12:05:31 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 klobag klobag abarth commit-queue darin eric kbr vangelis webkit.review.bot oldest_to_newest 314727 0 klobag 2010-11-29 16:40:43 -0800 The shader in ContentLayerChromium assumes that color is in BGRA. It should honor the platform setting so that for the platform using RGBA, the color will be correct. 314729 1 75082 klobag 2010-11-29 16:45:25 -0800 Created attachment 75082 patch 314756 2 75082 kbr 2010-11-29 17:21:33 -0800 Comment on attachment 75082 patch View in context: https://bugs.webkit.org/attachment.cgi?id=75082&action=review The code change looks fine (though the duplicated shader is a little unfortunate) but the OOPS line about no new tests needs to be removed and the patch regenerated or the commit queue will reject it. > WebCore/ChangeLog:8 > + No new tests. (OOPS!) This line needs to be deleted. 314760 3 75088 klobag 2010-11-29 17:28:07 -0800 Created attachment 75088 Patch 314762 4 75088 kbr 2010-11-29 17:29:26 -0800 Comment on attachment 75088 Patch Looks good. 314765 5 75088 vangelis 2010-11-29 17:31:56 -0800 Comment on attachment 75088 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=75088&action=review > WebCore/platform/graphics/chromium/ContentLayerChromium.cpp:97 > + m_contentShaderProgram = createShaderProgram(m_context, vertexShaderString, SK_B32_SHIFT ? rgbaFragmentShaderString : bgraFragmentShaderString); As far as I can tell from SkColorPriv.h SK_B32_SHIFT is always non-zero, regardless of little or big endian. Did you mean to check SK_R32_SHIFT instead? 314772 6 klobag 2010-11-29 17:40:31 -0800 This is actually not for the big endian or little endian. In chrome/skia/config/SkUserConfig.h, it tries to set the packing to BGRA instead of the default RGBA. So if the platform uses SkUserConfig.h, it uses BGRA packing. If the platform doesn't use the SkUserConfig.h, it uses the default RGBA packing. (In reply to comment #5) > (From update of attachment 75088 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=75088&action=review > > > WebCore/platform/graphics/chromium/ContentLayerChromium.cpp:97 > > + m_contentShaderProgram = createShaderProgram(m_context, vertexShaderString, SK_B32_SHIFT ? rgbaFragmentShaderString : bgraFragmentShaderString); > > As far as I can tell from SkColorPriv.h SK_B32_SHIFT is always non-zero, regardless of little or big endian. Did you mean to check SK_R32_SHIFT instead? 314780 7 vangelis 2010-11-29 17:55:24 -0800 (In reply to comment #6) > This is actually not for the big endian or little endian. In chrome/skia/config/SkUserConfig.h, it tries to set the packing to BGRA instead of the default RGBA. So if the platform uses SkUserConfig.h, it uses BGRA packing. If the platform doesn't use the SkUserConfig.h, it uses the default RGBA packing. > Ah, ok. Makes sense. Thanks. > (In reply to comment #5) > > (From update of attachment 75088 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=75088&action=review > > > > > WebCore/platform/graphics/chromium/ContentLayerChromium.cpp:97 > > > + m_contentShaderProgram = createShaderProgram(m_context, vertexShaderString, SK_B32_SHIFT ? rgbaFragmentShaderString : bgraFragmentShaderString); > > > > As far as I can tell from SkColorPriv.h SK_B32_SHIFT is always non-zero, regardless of little or big endian. Did you mean to check SK_R32_SHIFT instead? 314849 8 commit-queue 2010-11-29 21:14:47 -0800 The commit-queue encountered the following flaky tests while processing attachment 75088: fast/workers/storage/use-same-database-in-page-and-workers.html http/tests/appcache/foreign-fallback.html Please file bugs against the tests. These tests were authored by ap@webkit.org and dumi@chromium.org. The commit-queue is continuing to process your patch. 314874 9 75088 commit-queue 2010-11-29 23:27:00 -0800 Comment on attachment 75088 Patch Rejecting patch 75088 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=eseidel-cq-sl', 'build', '--no-clean', '--no-update', '--build-style=both']" exit_code: 2 Last 500 characters of output: 86_64 c++ com.apple.compilers.gcc.4_2 CompileC /Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/x86_64/IndentOutdentCommand.o /Projects/CommitQueue/WebCore/editing/IndentOutdentCommand.cpp normal x86_64 c++ com.apple.compilers.gcc.4_2 CompileC /Projects/CommitQueue/WebKitBuild/WebCore.build/Debug/WebCore.build/Objects-normal/x86_64/ImageDocument.o /Projects/CommitQueue/WebCore/html/ImageDocument.cpp normal x86_64 c++ com.apple.compilers.gcc.4_2 (21 failures) Full output: http://queues.webkit.org/results/6415104 315144 10 kbr 2010-11-30 10:37:30 -0800 That build failure looks unrelated to this change. Trying again. 315447 11 klobag 2010-11-30 17:37:51 -0800 I do have a style change for this CL. If it is not committed yet, can I provide another patch? 315463 12 kbr 2010-11-30 18:10:17 -0800 (In reply to comment #11) > I do have a style change for this CL. If it is not committed yet, can I provide another patch? Go ahead. It looks like the commit queue has not been running due to redness in the tree. I'll remove the cq+ and we can hope that the initial patch doesn't get landed; if it does, I'll deal with the merge by hand. 315467 13 commit-queue 2010-11-30 18:14:52 -0800 The commit-queue encountered the following flaky tests while processing attachment 75088: fast/workers/storage/use-same-database-in-page-and-workers.html Please file bugs against the tests. These tests were authored by dumi@chromium.org. The commit-queue is continuing to process your patch. 315495 14 75244 klobag 2010-11-30 19:41:58 -0800 Created attachment 75244 Patch 315756 15 75244 kbr 2010-12-01 11:11:17 -0800 Comment on attachment 75244 Patch Looks fine. I'm going to land this by hand. 315759 16 kbr 2010-12-01 11:14:01 -0800 Committed r73046: <http://trac.webkit.org/changeset/73046> 315789 17 webkit.review.bot 2010-12-01 12:00:19 -0800 http://trac.webkit.org/changeset/73046 might have broken GTK Linux 32-bit Release The following tests are not passing: media/controls-drag-timebar.html 315794 18 kbr 2010-12-01 12:05:31 -0800 There was a compiler warning on Mac OS X in the original patch that Darin helpfully fixed up in http://trac.webkit.org/changeset/73053 . 75082 2010-11-29 16:45:25 -0800 2010-11-29 17:28:04 -0800 patch color.txt text/plain 3150 klobag SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3Mjg0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMTEtMjkgIEdyYWNlIEtsb2JhICA8a2xvYmFnQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Y2hyb21pdW1dIENvbnRlbnRMYXllckNocm9taXVtIHNoYWRlciBzaG91bGQgaG9ub3IgdGhlIHBs YXRmb3JtIFNrX3hfU0hJRlQgdmFsdWUgaW5zdGVhZCBvZiBhc3N1bWluZyBCR1JBIGNvbG9yCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDE4OQorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Q29udGVudExheWVyQ2hyb21pdW06OlNoYXJlZFZhbHVlczo6U2hhcmVkVmFsdWVzKTpVc2UgU0tf QjMyX1NISUZUIHRvIGRlY2lkZSB3aGV0aGVyIHRvIHVzZSBSR0JBIHNoYWRlciBvciBCR1JBIHNo YWRlci4KKwogMjAxMC0xMS0yOSAgWGlhb21laSBKaSAgPHhqaUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNw cAkocmV2aXNpb24gNzI4NDMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0NvbnRlbnRMYXllckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBA QAogI2lmIFBMQVRGT1JNKFNLSUEpCiAjaW5jbHVkZSAiTmF0aXZlSW1hZ2VTa2lhLmgiCiAjaW5j bHVkZSAiUGxhdGZvcm1Db250ZXh0U2tpYS5oIgorI2luY2x1ZGUgIlNrQ29sb3JQcml2LmgiCiAj aW5jbHVkZSAic2tpYS9leHQvcGxhdGZvcm1fY2FudmFzLmgiCiAjZWxpZiBQTEFURk9STShDRykK ICNpbmNsdWRlIDxDb3JlR3JhcGhpY3MvQ0dCaXRtYXBDb250ZXh0Lmg+CkBAIC02OCw4ICs2OSwy MCBAQCBDb250ZW50TGF5ZXJDaHJvbWl1bTo6U2hhcmVkVmFsdWVzOjpTaGFyCiAgICAgICAgICIg IHZfdGV4Q29vcmQgPSBhX3RleENvb3JkOyAgIFxuIgogICAgICAgICAifSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcbiI7CiAKKyAgICAvLyBDb2xvciBpcyBpbiBSR0JBIG9yZGVyLgorICAg IGNoYXIgcmdiYUZyYWdtZW50U2hhZGVyU3RyaW5nW10gPQorICAgICAgICAicHJlY2lzaW9uIG1l ZGl1bXAgZmxvYXQ7ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgorICAgICAgICAidmFy eWluZyB2ZWMyIHZfdGV4Q29vcmQ7ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgorICAg ICAgICAidW5pZm9ybSBzYW1wbGVyMkQgc190ZXh0dXJlOyAgICAgICAgICAgICAgICAgICAgICAg IFxuIgorICAgICAgICAidW5pZm9ybSBmbG9hdCBhbHBoYTsgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFxuIgorICAgICAgICAidm9pZCBtYWluKCkgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFxuIgorICAgICAgICAieyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgorICAgICAgICAiICB2ZWM0IHRleENvbG9y ID0gdGV4dHVyZTJEKHNfdGV4dHVyZSwgdl90ZXhDb29yZCk7IFxuIgorICAgICAgICAiICBnbF9G cmFnQ29sb3IgPSB0ZXhDb2xvciAqIGFscGhhOyBcbiIKKyAgICAgICAgIn0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiI7CisKICAgICAvLyBDb2xv ciBpcyBpbiBCR1JBIG9yZGVyLgotICAgIGNoYXIgZnJhZ21lbnRTaGFkZXJTdHJpbmdbXSA9Cisg ICAgY2hhciBiZ3JhRnJhZ21lbnRTaGFkZXJTdHJpbmdbXSA9CiAgICAgICAgICJwcmVjaXNpb24g bWVkaXVtcCBmbG9hdDsgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCiAgICAgICAgICJ2 YXJ5aW5nIHZlYzIgdl90ZXhDb29yZDsgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCiAg ICAgICAgICJ1bmlmb3JtIHNhbXBsZXIyRCBzX3RleHR1cmU7ICAgICAgICAgICAgICAgICAgICAg ICAgXG4iCkBAIC04MCw3ICs5MywxMSBAQCBDb250ZW50TGF5ZXJDaHJvbWl1bTo6U2hhcmVkVmFs dWVzOjpTaGFyCiAgICAgICAgICIgIGdsX0ZyYWdDb2xvciA9IHZlYzQodGV4Q29sb3IueiwgdGV4 Q29sb3IueSwgdGV4Q29sb3IueCwgdGV4Q29sb3IudykgKiBhbHBoYTsgXG4iCiAgICAgICAgICJ9 ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iOwog Ci0gICAgbV9jb250ZW50U2hhZGVyUHJvZ3JhbSA9IGNyZWF0ZVNoYWRlclByb2dyYW0obV9jb250 ZXh0LCB2ZXJ0ZXhTaGFkZXJTdHJpbmcsIGZyYWdtZW50U2hhZGVyU3RyaW5nKTsKKyNpZiBQTEFU Rk9STShTS0lBKQorICAgIG1fY29udGVudFNoYWRlclByb2dyYW0gPSBjcmVhdGVTaGFkZXJQcm9n cmFtKG1fY29udGV4dCwgdmVydGV4U2hhZGVyU3RyaW5nLCBTS19CMzJfU0hJRlQgPyByZ2JhRnJh Z21lbnRTaGFkZXJTdHJpbmcgOiBiZ3JhRnJhZ21lbnRTaGFkZXJTdHJpbmcpOworI2Vsc2UKKyAg ICBtX2NvbnRlbnRTaGFkZXJQcm9ncmFtID0gY3JlYXRlU2hhZGVyUHJvZ3JhbShtX2NvbnRleHQs IHZlcnRleFNoYWRlclN0cmluZywgYmdyYUZyYWdtZW50U2hhZGVyU3RyaW5nKTsKKyNlbmRpZgog ICAgIGlmICghbV9jb250ZW50U2hhZGVyUHJvZ3JhbSkgewogICAgICAgICBMT0dfRVJST1IoIkNv bnRlbnRMYXllckNocm9taXVtOiBGYWlsZWQgdG8gY3JlYXRlIHNoYWRlciBwcm9ncmFtIik7CiAg ICAgICAgIHJldHVybjsK 75088 2010-11-29 17:28:07 -0800 2010-11-30 19:41:55 -0800 Patch bug-50189-20101129172805.patch text/plain 3117 klobag SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3Mjg0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMTEtMjkgIEdyYWNlIEtsb2JhICA8a2xvYmFnQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Y2hyb21pdW1dIENvbnRlbnRMYXllckNocm9taXVtIHNoYWRlciBzaG91bGQgaG9ub3IgdGhlIHBs YXRmb3JtIFNrX3hfU0hJRlQgdmFsdWUgaW5zdGVhZCBvZiBhc3N1bWluZyBCR1JBIGNvbG9yCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDE4OQorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyQ2hyb21pdW06OlNoYXJlZFZhbHVl czo6U2hhcmVkVmFsdWVzKTpVc2UgU0tfQjMyX1NISUZUIHRvIGRlY2lkZSB3aGV0aGVyIHRvIHVz ZSBSR0JBIHNoYWRlciBvciBCR1JBIHNoYWRlci4KKwogMjAxMC0xMS0yOSAgWGlhb21laSBKaSAg PHhqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgSHlhdHQuCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9t aXVtLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0NvbnRlbnRMYXllckNocm9taXVtLmNwcAkocmV2aXNpb24gNzI4NDMpCisrKyBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQAogI2lmIFBMQVRGT1JNKFNLSUEpCiAjaW5jbHVkZSAi TmF0aXZlSW1hZ2VTa2lhLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1Db250ZXh0U2tpYS5oIgorI2lu Y2x1ZGUgIlNrQ29sb3JQcml2LmgiCiAjaW5jbHVkZSAic2tpYS9leHQvcGxhdGZvcm1fY2FudmFz LmgiCiAjZWxpZiBQTEFURk9STShDRykKICNpbmNsdWRlIDxDb3JlR3JhcGhpY3MvQ0dCaXRtYXBD b250ZXh0Lmg+CkBAIC02OCw4ICs2OSwyMCBAQCBDb250ZW50TGF5ZXJDaHJvbWl1bTo6U2hhcmVk VmFsdWVzOjpTaGFyCiAgICAgICAgICIgIHZfdGV4Q29vcmQgPSBhX3RleENvb3JkOyAgIFxuIgog ICAgICAgICAifSAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiI7CiAKKyAgICAvLyBDb2xv ciBpcyBpbiBSR0JBIG9yZGVyLgorICAgIGNoYXIgcmdiYUZyYWdtZW50U2hhZGVyU3RyaW5nW10g PQorICAgICAgICAicHJlY2lzaW9uIG1lZGl1bXAgZmxvYXQ7ICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFxuIgorICAgICAgICAidmFyeWluZyB2ZWMyIHZfdGV4Q29vcmQ7ICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFxuIgorICAgICAgICAidW5pZm9ybSBzYW1wbGVyMkQgc190ZXh0dXJl OyAgICAgICAgICAgICAgICAgICAgICAgIFxuIgorICAgICAgICAidW5pZm9ybSBmbG9hdCBhbHBo YTsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgorICAgICAgICAidm9pZCBtYWlu KCkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgorICAgICAgICAi eyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuIgor ICAgICAgICAiICB2ZWM0IHRleENvbG9yID0gdGV4dHVyZTJEKHNfdGV4dHVyZSwgdl90ZXhDb29y ZCk7IFxuIgorICAgICAgICAiICBnbF9GcmFnQ29sb3IgPSB0ZXhDb2xvciAqIGFscGhhOyBcbiIK KyAgICAgICAgIn0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBcbiI7CisKICAgICAvLyBDb2xvciBpcyBpbiBCR1JBIG9yZGVyLgotICAgIGNoYXIgZnJh Z21lbnRTaGFkZXJTdHJpbmdbXSA9CisgICAgY2hhciBiZ3JhRnJhZ21lbnRTaGFkZXJTdHJpbmdb XSA9CiAgICAgICAgICJwcmVjaXNpb24gbWVkaXVtcCBmbG9hdDsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXG4iCiAgICAgICAgICJ2YXJ5aW5nIHZlYzIgdl90ZXhDb29yZDsgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXG4iCiAgICAgICAgICJ1bmlmb3JtIHNhbXBsZXIyRCBzX3RleHR1 cmU7ICAgICAgICAgICAgICAgICAgICAgICAgXG4iCkBAIC04MCw3ICs5MywxMSBAQCBDb250ZW50 TGF5ZXJDaHJvbWl1bTo6U2hhcmVkVmFsdWVzOjpTaGFyCiAgICAgICAgICIgIGdsX0ZyYWdDb2xv ciA9IHZlYzQodGV4Q29sb3IueiwgdGV4Q29sb3IueSwgdGV4Q29sb3IueCwgdGV4Q29sb3Iudykg KiBhbHBoYTsgXG4iCiAgICAgICAgICJ9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgXG4iOwogCi0gICAgbV9jb250ZW50U2hhZGVyUHJvZ3JhbSA9IGNy ZWF0ZVNoYWRlclByb2dyYW0obV9jb250ZXh0LCB2ZXJ0ZXhTaGFkZXJTdHJpbmcsIGZyYWdtZW50 U2hhZGVyU3RyaW5nKTsKKyNpZiBQTEFURk9STShTS0lBKQorICAgIG1fY29udGVudFNoYWRlclBy b2dyYW0gPSBjcmVhdGVTaGFkZXJQcm9ncmFtKG1fY29udGV4dCwgdmVydGV4U2hhZGVyU3RyaW5n LCBTS19CMzJfU0hJRlQgPyByZ2JhRnJhZ21lbnRTaGFkZXJTdHJpbmcgOiBiZ3JhRnJhZ21lbnRT aGFkZXJTdHJpbmcpOworI2Vsc2UKKyAgICBtX2NvbnRlbnRTaGFkZXJQcm9ncmFtID0gY3JlYXRl U2hhZGVyUHJvZ3JhbShtX2NvbnRleHQsIHZlcnRleFNoYWRlclN0cmluZywgYmdyYUZyYWdtZW50 U2hhZGVyU3RyaW5nKTsKKyNlbmRpZgogICAgIGlmICghbV9jb250ZW50U2hhZGVyUHJvZ3JhbSkg ewogICAgICAgICBMT0dfRVJST1IoIkNvbnRlbnRMYXllckNocm9taXVtOiBGYWlsZWQgdG8gY3Jl YXRlIHNoYWRlciBwcm9ncmFtIik7CiAgICAgICAgIHJldHVybjsK 75244 2010-11-30 19:41:58 -0800 2010-12-01 11:11:17 -0800 Patch bug-50189-20101130194156.patch text/plain 3104 klobag SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MzAwNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTAtMTEtMzAgIEdyYWNlIEtsb2JhICA8a2xvYmFnQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Y2hyb21pdW1dIENvbnRlbnRMYXllckNocm9taXVtIHNoYWRlciBzaG91bGQgaG9ub3IgdGhlIHBs YXRmb3JtIFNrX3hfU0hJRlQgdmFsdWUgaW5zdGVhZCBvZiBhc3N1bWluZyBCR1JBIGNvbG9yCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDE4OQorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudExheWVyQ2hyb21pdW06OlNoYXJlZFZhbHVl czo6U2hhcmVkVmFsdWVzKTpVc2UgU0tfQjMyX1NISUZUIHRvIGRlY2lkZSB3aGV0aGVyIHRvIHVz ZSBSR0JBIG9yIEJHUkEgc2hhZGVyIGZvciBTa2lhIHBvcnQuCisKIDIwMTAtMTEtMzAgIFBhdHJp Y2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg QW5kcmVhcyBLbGluZy4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Q29udGVudExheWVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA3MzAw NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSw3IEBACiAjaWYgUExBVEZPUk0o U0tJQSkKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNraWEuaCIKICNpbmNsdWRlICJQbGF0Zm9ybUNv bnRleHRTa2lhLmgiCisjaW5jbHVkZSAiU2tDb2xvclByaXYuaCIKICNpbmNsdWRlICJza2lhL2V4 dC9wbGF0Zm9ybV9jYW52YXMuaCIKICNlbGlmIFBMQVRGT1JNKENHKQogI2luY2x1ZGUgPENvcmVH cmFwaGljcy9DR0JpdG1hcENvbnRleHQuaD4KQEAgLTY4LDggKzY5LDIwIEBAIENvbnRlbnRMYXll ckNocm9taXVtOjpTaGFyZWRWYWx1ZXM6OlNoYXIKICAgICAgICAgIiAgdl90ZXhDb29yZCA9IGFf dGV4Q29vcmQ7ICAgXG4iCiAgICAgICAgICJ9ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxu IjsKIAorICAgIC8vIENvbG9yIGlzIGluIFJHQkEgb3JkZXIuCisgICAgY2hhciByZ2JhRnJhZ21l bnRTaGFkZXJTdHJpbmdbXSA9CisgICAgICAgICJwcmVjaXNpb24gbWVkaXVtcCBmbG9hdDsgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXG4iCisgICAgICAgICJ2YXJ5aW5nIHZlYzIgdl90ZXhD b29yZDsgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCisgICAgICAgICJ1bmlmb3JtIHNh bXBsZXIyRCBzX3RleHR1cmU7ICAgICAgICAgICAgICAgICAgICAgICAgXG4iCisgICAgICAgICJ1 bmlmb3JtIGZsb2F0IGFscGhhOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4iCisg ICAgICAgICJ2b2lkIG1haW4oKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXG4iCisgICAgICAgICJ7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXG4iCisgICAgICAgICIgIHZlYzQgdGV4Q29sb3IgPSB0ZXh0dXJlMkQoc190 ZXh0dXJlLCB2X3RleENvb3JkKTsgXG4iCisgICAgICAgICIgIGdsX0ZyYWdDb2xvciA9IHRleENv bG9yICogYWxwaGE7IFxuIgorICAgICAgICAifSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFxuIjsKKwogICAgIC8vIENvbG9yIGlzIGluIEJHUkEgb3Jk ZXIuCi0gICAgY2hhciBmcmFnbWVudFNoYWRlclN0cmluZ1tdID0KKyAgICBjaGFyIGJncmFGcmFn bWVudFNoYWRlclN0cmluZ1tdID0KICAgICAgICAgInByZWNpc2lvbiBtZWRpdW1wIGZsb2F0OyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKICAgICAgICAgInZhcnlpbmcgdmVjMiB2X3Rl eENvb3JkOyAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiIKICAgICAgICAgInVuaWZvcm0g c2FtcGxlcjJEIHNfdGV4dHVyZTsgICAgICAgICAgICAgICAgICAgICAgICBcbiIKQEAgLTgwLDYg KzkzLDEyIEBAIENvbnRlbnRMYXllckNocm9taXVtOjpTaGFyZWRWYWx1ZXM6OlNoYXIKICAgICAg ICAgIiAgZ2xfRnJhZ0NvbG9yID0gdmVjNCh0ZXhDb2xvci56LCB0ZXhDb2xvci55LCB0ZXhDb2xv ci54LCB0ZXhDb2xvci53KSAqIGFscGhhOyBcbiIKICAgICAgICAgIn0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiI7CiAKKyNpZiBQTEFURk9STShT S0lBKQorICAgIC8vIEFzc3VtaW5nIHRoZSBwYWNraW5nIGlzIGVpdGhlciBTa2lhIGRlZmF1bHQg UkdCQSBvciBDaHJvbWl1bSBkZWZhdWx0IEJHUkEuCisgICAgY2hhciogZnJhZ21lbnRTaGFkZXJT dHJpbmcgPSBTS19CMzJfU0hJRlQgPyByZ2JhRnJhZ21lbnRTaGFkZXJTdHJpbmcgOiBiZ3JhRnJh Z21lbnRTaGFkZXJTdHJpbmc7CisjZWxzZQorICAgIGNoYXIqIGZyYWdtZW50U2hhZGVyU3RyaW5n ID0gYmdyYUZyYWdtZW50U2hhZGVyU3RyaW5nOworI2VuZGlmCiAgICAgbV9jb250ZW50U2hhZGVy UHJvZ3JhbSA9IGNyZWF0ZVNoYWRlclByb2dyYW0obV9jb250ZXh0LCB2ZXJ0ZXhTaGFkZXJTdHJp bmcsIGZyYWdtZW50U2hhZGVyU3RyaW5nKTsKICAgICBpZiAoIW1fY29udGVudFNoYWRlclByb2dy YW0pIHsKICAgICAgICAgTE9HX0VSUk9SKCJDb250ZW50TGF5ZXJDaHJvbWl1bTogRmFpbGVkIHRv IGNyZWF0ZSBzaGFkZXIgcHJvZ3JhbSIpOwo=