74775 2011-12-16 18:12:17 -0800 WebKit editing throws exception when monochrome color dragged onto text 2011-12-22 02:20:04 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Mac (Intel) OS X 10.7 RESOLVED FIXED P2 Major --- 1 jalkut webkit-unassigned ap darin enrica rakuco rniwa webkit.review.bot zoltan oldest_to_newest 523197 0 jalkut 2011-12-16 18:12:17 -0800 Note: this was reproduced with WebKit nightly as of two days ago. In any app that supports WebKit editing, if a color is dragged onto text, typically the dragged color is interpreted to mean that the text should be changed to that color. If the color being dragged happens to be monochrome, e.g. of the NSCalibratedWhiteColorSpace, then WebKit throws an exception because it fails to get the expected RGB components from the dragged color. This is an issue for any WebKit editing app that allows users to display a standard color panel, and then to drag a color swatch onto the edited text. It's an especially heinous issues in apps, like my own, that treat uncaught exceptions as crash-worthy events ;) To reproduce in Safari or WebKit nightly: 1. Open the Snippet editor. 2. Enter this HTML content: <div contentEditable="true">Hello - try dragging a black/white colorspace color to me.</div> 3. Select the editable section in the rendering pane of the snippet editor. 4. From another app, e.g. TextEdit, open the standard Color panel. 5. Switch to the "Sliders" color panel pane, and choose "Gray Scale Slider" from the popup. 6. Drag whatever color you have selected from the large color preview rectangle next to the magnifying glass, while cmd-tabbing back to Safari to your snippet content. 7. Drag it to the text and release. Result: nothing happens, and Safari logs to the console: 2011-12-16 21:04:10.792 Safari[40273:1d07] *** Canceling drag because exception 'NSInvalidArgumentException' (reason '*** -redComponent not valid for the NSColor NSCalibratedWhiteColorSpace 0.375912 1; need to first convert colorspace.') was raised during a dragging session More typically, in an app that supports the Color panel natively, the exception is thrown with a full backtrace. For example, I interrupted Safari with gdb and called: call (void) [[NSColorPanel sharedColorPanel] makeKeyAndOrderFront:nil] Then I dragged a color to the text and received this in gdb: 2011-12-16 21:02:39.357 Safari[40273:1d07] *** -redComponent not valid for the NSColor NSCalibratedWhiteColorSpace 0.754032 1; need to first convert colorspace. 2011-12-16 21:02:39.367 Safari[40273:1d07] ( 0 CoreFoundation 0x00007fff8b04b286 __exceptionPreprocess + 198 1 libobjc.A.dylib 0x00007fff8f80dd5e objc_exception_throw + 43 2 CoreFoundation 0x00007fff8b04b0ba +[NSException raise:format:arguments:] + 106 3 CoreFoundation 0x00007fff8b04b044 +[NSException raise:format:] + 116 4 AppKit 0x00007fff8dfbd46c -[NSColor redComponent] + 65 5 WebCore 0x0000000100c427a7 _ZNK7WebCore8DragData7asColorEv + 55 6 WebCore 0x0000000100c3efcc _ZN7WebCore14DragController16concludeEditDragEPNS_8DragDataE + 236 7 WebCore 0x0000000100c3ed01 _ZN7WebCore14DragController11performDragEPNS_8DragDataE + 593 8 WebKit 0x00000001003963a7 -[WebView performDragOperation:] + 199 9 AppKit 0x00007fff8e05cc6a NSCoreDragReceiveMessageProc + 1462 10 HIServices 0x00007fff86fe760f CallReceiveMessageCollectionWithMessage + 70 11 HIServices 0x00007fff86fe7714 DoMultipartDropMessage + 126 12 HIServices 0x00007fff86fe791d DoDropMessage + 55 13 HIServices 0x00007fff86fe7df5 SendDropMessage + 39 14 HIServices 0x00007fff86feab08 DragInApplication + 717 15 HIServices 0x00007fff86feadaa CoreDragStartDragging + 517 16 AppKit 0x00007fff8e05ab4c -[NSCoreDragManager _dragUntilMouseUp:accepted:] + 885 17 AppKit 0x00007fff8e05a218 -[NSCoreDragManager dragImage:fromWindow:at:offset:event:pasteboard:source:slideBack:] + 1455 18 AppKit 0x00007fff8e34ed86 -[NSWindow(NSDrag) dragImage:at:offset:event:pasteboard:source:slideBack:] + 132 19 AppKit 0x00007fff8dfd1260 +[NSColorPanel dragColor:withEvent:fromView:] + 785 20 AppKit 0x00007fff8dfcc80e -[NSColorSwatch mouseDown:] + 547 21 AppKit 0x00007fff8dd520e0 -[NSWindow sendEvent:] + 6306 22 AppKit 0x00007fff8dcea68f -[NSApplication sendEvent:] + 5593 23 Safari 0x00007fff895496f8 -[BrowserApplication sendEvent:] + 822 24 AppKit 0x00007fff8dc80682 -[NSApplication run] + 555 25 AppKit 0x00007fff8deff80c NSApplicationMain + 867 26 Safari 0x00007fff896ffa6f SafariMain + 197 27 Safari 0x0000000100000f24 Safari + 3876 524654 1 ap 2011-12-20 09:39:26 -0800 Daniel, would you be willing to make a patch <http://www.webkit.org/coding/contributing.html>? This should be easy to fix, at least as long as the expectation is to get an RGB color in HTML. 524661 2 jalkut 2011-12-20 10:01:38 -0800 Hi Alexey - sure, I will take a crack at it. I am not currently set up for WebKit dev, so it might take a me a little while to get my environment back up to speed. Feel free to leave this with me until I either attach a patch or throw my arms up ;) 525292 3 120185 jalkut 2011-12-21 09:41:54 -0800 Created attachment 120185 Fix the NSColor exception thrown by converting to RGB colorspace if necessary The attached patch addresses the problem by checking ahead of time whether the provided color uses an RGB colorspace model. If it doesn't, it converts the color to RGB colorspace before accessing its components. I don't think this affects layout tests, and I'm not sure if there is a straightforward way to cover the bug using any other test mechanism. In IRC it was suggested that a manual test may be appropriate? I built and tested the fix on Lion. 525299 4 rniwa 2011-12-21 09:53:56 -0800 (In reply to comment #3) > I don't think this affects layout tests, and I'm not sure if there is a straightforward way to cover the bug using any other test mechanism. In IRC it was suggested that a manual test may be appropriate? Yeah, I don't think eventSender, etc... would work here. Could you add a manual test instead? it's in trunk/ManualTests. 525362 5 120196 jalkut 2011-12-21 11:19:18 -0800 Created attachment 120196 Patch for bug fix and patch for manual test case I added a manual test case to the patch. Hope that looks good! Thanks for the guidance. 525368 6 120196 darin 2011-12-21 11:23:08 -0800 Comment on attachment 120196 Patch for bug fix and patch for manual test case View in context: https://bugs.webkit.org/attachment.cgi?id=120196&action=review > Source/WebCore/platform/mac/DragDataMac.mm:121 > NSColor *color = [NSColor colorFromPasteboard:m_pasteboard.get()]; > + > + // The supplied color may not be in an RGB colorspace. This commonly occurs when e.g. > + // a color is dragged from the NSColorPanel grayscale picker. Before we attempt to access RGB components, > + // ensure it's appropriately converted to an RGB colorspace. > + if ([[color colorSpace] colorSpaceModel] != NSRGBColorSpaceModel) { > + color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; > + } Why not call that method unconditionally? Is there a case that would behave worse? We don’t put braces around a single-line if statement body in WebKit codings style. I suggest removing the third sentence of that comment, since it just repeats what the code does. 525369 7 darin 2011-12-21 11:24:01 -0800 Test looks great, just waiting to hear if we should just remove the if statement condition entirely. 525373 8 webkit.review.bot 2011-12-21 11:25:04 -0800 Attachment 120196 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit + 3a244c5...0a192a1 master -> origin/master (forced update) LayoutTests/inspector/extensions/extensions-api-expected.txt: needs merge update-index --refresh: command returned error: 1 Died at Tools/Scripts/update-webkit line 158. If any of these errors are false positives, please file a bug against check-webkit-style. 525375 9 120196 rniwa 2011-12-21 11:25:27 -0800 Comment on attachment 120196 Patch for bug fix and patch for manual test case View in context: https://bugs.webkit.org/attachment.cgi?id=120196&action=review r- due to various nits. > ChangeLog:3 > + Add manual test covering failure to accept grayscale color drags to contentEditable regions. This line should repeat what the bug summary. > ManualTests/drag-color-to-contenteditable.html:3 > +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" > + "http://www.w3.org/TR/html4/strict.dtd"> > +<html lang="en"> Can we use HTML5 style DOCTYPE? <!DOCTYPE html> <html> > ManualTests/drag-color-to-contenteditable.html:5 > +<head> > +</head> We don't need head. > ManualTests/drag-color-to-contenteditable.html:11 > +<li>Open a color panel in some host app that facilitates doing so, such as TextEdit.app.</li> I don't understand what you mean by "that facilitates doing so". I think it's better to say "Open a color panel in some app such as TextEdit.app." > Source/WebCore/ChangeLog:4 > + Handle non-RGB colorspace colors in the Mac platform drag manager. Fixes NSException thrown > + when dragging monochrome colors to contentEditable regions. This line should repeat what the bug summary. You can add a long description below "Reviewed by" line followed by a blank line. > Source/WebCore/platform/mac/DragDataMac.mm:121 > + if ([[color colorSpace] colorSpaceModel] != NSRGBColorSpaceModel) { > + color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; > + } WebKit style is not to wrap single statement with { and }. 525381 10 jalkut 2011-12-21 11:30:41 -0800 (In reply to comment #6) > (From update of attachment 120196 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=120196&action=review > > > Source/WebCore/platform/mac/DragDataMac.mm:121 > > NSColor *color = [NSColor colorFromPasteboard:m_pasteboard.get()]; > > + > > + // The supplied color may not be in an RGB colorspace. This commonly occurs when e.g. > > + // a color is dragged from the NSColorPanel grayscale picker. Before we attempt to access RGB components, > > + // ensure it's appropriately converted to an RGB colorspace. > > + if ([[color colorSpace] colorSpaceModel] != NSRGBColorSpaceModel) { > > + color = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; > > + } > > Why not call that method unconditionally? Is there a case that would behave worse? We don’t put braces around a single-line if statement body in WebKit codings style. > > I suggest removing the third sentence of that comment, since it just repeats what the code does. My thinking for testing is that there could be some nuance of the color that a client wants to be conveyed and preserved without a potentially lossy conversion. Since I have to pick a specific RGB-model colorspace to convert to, doing so unilaterally would e.g. convert a device-RGB or custom-colorspace color to calibrated RGB colorspace when it's not called for. 525384 11 darin 2011-12-21 11:32:40 -0800 (In reply to comment #10) > My thinking for testing is that there could be some nuance of the color that a client wants to be conveyed and preserved without a potentially lossy conversion. Since I have to pick a specific RGB-model colorspace to convert to, doing so unilaterally would e.g. convert a device-RGB or custom-colorspace color to calibrated RGB colorspace when it's not called for. An interesting though. I wonder if this does any good in practice. Or any harm. If neither, then I suppose it does not matter how we write the code. I suppose the conservative thing is to write the code as you have since it matches the old behavior in more cases. 525386 12 jalkut 2011-12-21 11:33:08 -0800 (In reply to comment #9) > (From update of attachment 120196 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=120196&action=review > > r- due to various nits. Thank you for the feedback. I will create a new patch. FWIW I created the test by copying "template.html" in the ManualTests folder. So some of the HTML-level nits are from what I assumed to be the canonical starting point for tests. 525388 13 darin 2011-12-21 11:34:01 -0800 (In reply to comment #12) > FWIW I created the test by copying "template.html" in the ManualTests folder. So some of the HTML-level nits are from what I assumed to be the canonical starting point for tests. We should file a separate bug to track fixing that. 525392 14 jalkut 2011-12-21 11:36:01 -0800 (In reply to comment #11) > An interesting though. I wonder if this does any good in practice. Or any harm. If neither, then I suppose it does not matter how we write the code. > > I suppose the conservative thing is to write the code as you have since it matches the old behavior in more cases. That was my thinking. I doubt that it will do much good in practice, but as it's so unpredictable what variety of applications will use contentEditable, I thought it was worth playing it safe. The ONLY cases where the code will behavior differently under the patch are when it's avoiding an imminent exception. 525410 15 120204 jalkut 2011-12-21 11:49:53 -0800 Created attachment 120204 Patch for fix and test with review corrections applied I have incorporated the suggested revisions. Let me know if I missed anything. 525422 16 rniwa 2011-12-21 11:59:25 -0800 The patch looks great to me. Thanks for the fix. 525430 17 jalkut 2011-12-21 12:03:08 -0800 (In reply to comment #16) > The patch looks great to me. Thanks for the fix. Great, glad to hear it! I submitted a patch for the template file changes as suggested: https://bugs.webkit.org/show_bug.cgi?id=75025 526107 18 120204 webkit.review.bot 2011-12-22 02:19:59 -0800 Comment on attachment 120204 Patch for fix and test with review corrections applied Clearing flags on attachment: 120204 Committed r103507: <http://trac.webkit.org/changeset/103507> 526108 19 webkit.review.bot 2011-12-22 02:20:04 -0800 All reviewed patches have been landed. Closing bug. 120185 2011-12-21 09:41:54 -0800 2011-12-21 11:19:18 -0800 Fix the NSColor exception thrown by converting to RGB colorspace if necessary ColorDrag.patch text/plain 1866 jalkut SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzQxMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDExLTEyLTIxICBEYW5pZWwg SmFsa3V0ICA8amFsa3V0QHJlZC1zd2VhdGVyLmNvbT4KKworICAgICAgICBIYW5kbGUgbm9uLVJH QiBjb2xvcnNwYWNlIGNvbG9ycyBpbiB0aGUgTWFjIHBsYXRmb3JtIGRyYWcgbWFuYWdlci4gRml4 ZXMgTlNFeGNlcHRpb24gdGhyb3duIAorICAgICAgICB3aGVuIGRyYWdnaW5nIG1vbm9jaHJvbWUg Y29sb3JzIHRvIGNvbnRlbnRFZGl0YWJsZSByZWdpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ3NzUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9EcmFnRGF0YU1hYy5tbToK KyAgICAgICAgKFdlYkNvcmU6OkRyYWdEYXRhOjphc0NvbG9yKToKKwogMjAxMS0xMi0yMCAgQW5k cmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtFeHRlbnNpb24gQVBJXSByZWZhY3RvciBleHRlbnNpb24gQVBJIGJ1aWxkIGNvZGUsIGV4 cG9zZSBleHBlcmltZW50YWwgQVBJcyBjb25kaXRpb25hbGx5IGluIGNocm9taXVtCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvRHJhZ0RhdGFNYWMubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0RyYWdEYXRhTWFjLm1tCShyZXZpc2lvbiAxMDMz MzgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvRHJhZ0RhdGFNYWMubW0JKHdvcmtp bmcgY29weSkKQEAgLTExMiw2ICsxMTIsMTQgQEAgU3RyaW5nIERyYWdEYXRhOjphc1BsYWluVGV4 dChGcmFtZSAqZnJhbQogQ29sb3IgRHJhZ0RhdGE6OmFzQ29sb3IoKSBjb25zdAogewogICAgIE5T Q29sb3IgKmNvbG9yID0gW05TQ29sb3IgY29sb3JGcm9tUGFzdGVib2FyZDptX3Bhc3RlYm9hcmQu Z2V0KCldOworICAgIAorICAgIC8vIFRoZSBzdXBwbGllZCBjb2xvciBtYXkgbm90IGJlIGluIGFu IFJHQiBjb2xvcnNwYWNlLiBUaGlzIGNvbW1vbmx5IG9jY3VycyB3aGVuIGUuZy4KKyAgICAvLyBh IGNvbG9yIGlzIGRyYWdnZWQgZnJvbSB0aGUgTlNDb2xvclBhbmVsIGdyYXlzY2FsZSBwaWNrZXIu IEJlZm9yZSB3ZSBhdHRlbXB0IHRvIGFjY2VzcyBSR0IgY29tcG9uZW50cywKKyAgICAvLyBlbnN1 cmUgaXQncyBhcHByb3ByaWF0ZWx5IGNvbnZlcnRlZCB0byBhbiBSR0IgY29sb3JzcGFjZS4KKyAg ICBpZiAoW1tjb2xvciBjb2xvclNwYWNlXSBjb2xvclNwYWNlTW9kZWxdICE9IE5TUkdCQ29sb3JT cGFjZU1vZGVsKSB7CisgICAgICAgIGNvbG9yID0gW2NvbG9yIGNvbG9yVXNpbmdDb2xvclNwYWNl TmFtZTpOU0NhbGlicmF0ZWRSR0JDb2xvclNwYWNlXTsKKyAgICB9CisgICAgCiAgICAgcmV0dXJu IG1ha2VSR0JBKChpbnQpKFtjb2xvciByZWRDb21wb25lbnRdICogMjU1LjAgKyAwLjUpLCAoaW50 KShbY29sb3IgZ3JlZW5Db21wb25lbnRdICogMjU1LjAgKyAwLjUpLCAKICAgICAgICAgICAgICAg ICAgICAgKGludCkoW2NvbG9yIGJsdWVDb21wb25lbnRdICogMjU1LjAgKyAwLjUpLCAoaW50KShb Y29sb3IgYWxwaGFDb21wb25lbnRdICogMjU1LjAgKyAwLjUpKTsKIH0K 120196 2011-12-21 11:19:18 -0800 2011-12-21 11:49:53 -0800 Patch for bug fix and patch for manual test case ColorDrag-withTest.patch text/plain 4115 jalkut SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzQx OCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDExLTEy LTIxICBEYW5pZWwgSmFsa3V0ICA8amFsa3V0QHJlZC1zd2VhdGVyLmNvbT4KKworICAgICAgICBB ZGQgbWFudWFsIHRlc3QgY292ZXJpbmcgZmFpbHVyZSB0byBhY2NlcHQgZ3JheXNjYWxlIGNvbG9y IGRyYWdzIHRvIGNvbnRlbnRFZGl0YWJsZSByZWdpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ3NzUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1hbnVhbFRlc3RzL2RyYWctY29sb3ItdG8tY29u dGVudGVkaXRhYmxlLmh0bWw6IEFkZGVkLgorCiAyMDExLTEyLTIxICBEYW5pZWwgQmF0ZXMgIDxk YmF0ZXNAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgQ01ha2Ugb3B0aW9uIHRvIG9ubHkgYnVp bGQgSmF2YVNjcmlwdENvcmUKSW5kZXg6IE1hbnVhbFRlc3RzL2RyYWctY29sb3ItdG8tY29udGVu dGVkaXRhYmxlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTWFudWFsVGVzdHMvZHJhZy1jb2xvci10by1j b250ZW50ZWRpdGFibGUuaHRtbAkocmV2aXNpb24gMCkKKysrIE1hbnVhbFRlc3RzL2RyYWctY29s b3ItdG8tY29udGVudGVkaXRhYmxlLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjggQEAK KzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxLy9FTiIKKyAgICAg ICAgImh0dHA6Ly93d3cudzMub3JnL1RSL2h0bWw0L3N0cmljdC5kdGQiPgorPGh0bWwgbGFuZz0i ZW4iPgorPGhlYWQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwPjxiPkJVRyBJRDo8L2I+IDxhIGhyZWY9 Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDc3NSI+NzQ3NzU8L2E+ IFdlYktpdCBlZGl0aW5nIHRocm93cyBleGNlcHRpb24gd2hlbiBtb25vY2hyb21lIGNvbG9yIGRy YWdnZWQgb250byB0ZXh0PC9wPgorCis8cCBpZD0idGVzdCIgc3R5bGU9ImJhY2tncm91bmQtY29s b3I6c2t5Ymx1ZTsgcGFkZGluZzozcHg7Ij48Yj5TVEVQUyBUTyBURVNUOjwvYj4gCis8b2w+Cis8 bGk+T3BlbiBhIGNvbG9yIHBhbmVsIGluIHNvbWUgaG9zdCBhcHAgdGhhdCBmYWNpbGl0YXRlcyBk b2luZyBzbywgc3VjaCBhcyBUZXh0RWRpdC5hcHAuPC9saT4KKzxsaT5TZWxlY3Qgc29tZSB0ZXh0 IGluIHRoZSBlZGl0YWJsZSByZWdpb24gYmVsb3cuPC9saT4KKzxsaT5EcmFnIGEgY29sb3Igc3dh dGNoIGZvciBhIG1vbm9jaHJvbWUgY29sb3IsIGUuZy4gYSBncmV5IGZyb20gdGhlIGdyYXlzY2Fs ZSBzbGlkZXIgb2YgdGhlIGNvbG9yIHBhbmVsLCB0byB0aGUgc2VsZWN0ZWQgdGV4dC48L2xpPgor PC9vbD4KKzwvcD4KKworPHAgaWQ9InN1Y2Nlc3MiIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOnBh bGVncmVlbjsgcGFkZGluZzozcHg7Ij48Yj5URVNUIFBBU1M6PC9iPiAKK0lmIHRoZSBjb2xvciBj aGFuZ2VzIHRvIHRoZSBkZXNpcmVkIGdyZXksIGFuZCB0aGUgZHJhZyBhcHBlYXJzIHRvIGJlIGFj Y2VwdGVkLCB0aGUgdGVzdCBwYXNzZXMuCis8L3A+CisKKzxwIGlkPSJmYWlsdXJlIiBzdHlsZT0i YmFja2dyb3VuZC1jb2xvcjojRkYzMzAwOyBwYWRkaW5nOjNweDsiPjxiPlRFU1QgRkFJTDo8L2I+ ICAKK0lmIHRoZSBjb2xvciBjaGFuZ2UgZG9lcyBub3QgYXBwbHkgdG8gdGhlIHRleHQsIGFuZCB0 aGUgZHJhZyBhcHBlYXJzIHRvIGJvdW5jZSBiYWNrLCB0aGVuIHRoZSBidWcgaXMgcHJvYmFibHkg b2NjdXJyaW5nLiBUaGUgYnVnIGNhbiBiZSBjb25maXJtZWQgYnkgbG9va2luZyBmb3IgZXZpZGVu Y2Ugb2YgYW4gdW5jYXVnaHQgZXhjZXB0aW9uIGluIHRoZSBzeXN0ZW0gY29uc29sZSBsb2cuCis8 L3A+CisKKzxkaXYgY29udGVudEVkaXRhYmxlPSJ0cnVlIj5TZWxlY3QgdGhpcyB0ZXh0IGFuZCBk cmFnIGEgZ3JheXNjYWxlIGNvbG9yIHRvIGl0LjwvZGl2PgorCis8L2JvZHk+Cis8L2h0bWw+Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDM0MTgpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0xMi0yMSAgRGFuaWVsIEph bGt1dCAgPGphbGt1dEByZWQtc3dlYXRlci5jb20+CisKKyAgICAgICAgSGFuZGxlIG5vbi1SR0Ig Y29sb3JzcGFjZSBjb2xvcnMgaW4gdGhlIE1hYyBwbGF0Zm9ybSBkcmFnIG1hbmFnZXIuIEZpeGVz IE5TRXhjZXB0aW9uIHRocm93biAKKyAgICAgICAgd2hlbiBkcmFnZ2luZyBtb25vY2hyb21lIGNv bG9ycyB0byBjb250ZW50RWRpdGFibGUgcmVnaW9ucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0Nzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTWFudWFsIHRlc3QgYWRkZWQgdG8gdHJ1bmsvTWFudWFs VGVzdHMvZHJhZy1jb2xvci10by1jb250ZW50ZWRpdGFibGUuaHRtbAorCisgICAgICAgICogcGxh dGZvcm0vbWFjL0RyYWdEYXRhTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0RhdGE6OmFz Q29sb3IpOgorCiAyMDExLTEyLTIwICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW0V4dGVuc2lvbiBBUEldIHJlZmFjdG9yIGV4 dGVuc2lvbiBBUEkgYnVpbGQgY29kZSwgZXhwb3NlIGV4cGVyaW1lbnRhbCBBUElzIGNvbmRpdGlv bmFsbHkgaW4gY2hyb21pdW0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9EcmFn RGF0YU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvRHJh Z0RhdGFNYWMubW0JKHJldmlzaW9uIDEwMzMzOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9EcmFnRGF0YU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTEyLDYgKzExMiwxNCBAQCBT dHJpbmcgRHJhZ0RhdGE6OmFzUGxhaW5UZXh0KEZyYW1lICpmcmFtCiBDb2xvciBEcmFnRGF0YTo6 YXNDb2xvcigpIGNvbnN0CiB7CiAgICAgTlNDb2xvciAqY29sb3IgPSBbTlNDb2xvciBjb2xvckZy b21QYXN0ZWJvYXJkOm1fcGFzdGVib2FyZC5nZXQoKV07CisgICAgCisgICAgLy8gVGhlIHN1cHBs aWVkIGNvbG9yIG1heSBub3QgYmUgaW4gYW4gUkdCIGNvbG9yc3BhY2UuIFRoaXMgY29tbW9ubHkg b2NjdXJzIHdoZW4gZS5nLgorICAgIC8vIGEgY29sb3IgaXMgZHJhZ2dlZCBmcm9tIHRoZSBOU0Nv bG9yUGFuZWwgZ3JheXNjYWxlIHBpY2tlci4gQmVmb3JlIHdlIGF0dGVtcHQgdG8gYWNjZXNzIFJH QiBjb21wb25lbnRzLAorICAgIC8vIGVuc3VyZSBpdCdzIGFwcHJvcHJpYXRlbHkgY29udmVydGVk IHRvIGFuIFJHQiBjb2xvcnNwYWNlLgorICAgIGlmIChbW2NvbG9yIGNvbG9yU3BhY2VdIGNvbG9y U3BhY2VNb2RlbF0gIT0gTlNSR0JDb2xvclNwYWNlTW9kZWwpIHsKKyAgICAgICAgY29sb3IgPSBb Y29sb3IgY29sb3JVc2luZ0NvbG9yU3BhY2VOYW1lOk5TQ2FsaWJyYXRlZFJHQkNvbG9yU3BhY2Vd OworICAgIH0KKyAgICAKICAgICByZXR1cm4gbWFrZVJHQkEoKGludCkoW2NvbG9yIHJlZENvbXBv bmVudF0gKiAyNTUuMCArIDAuNSksIChpbnQpKFtjb2xvciBncmVlbkNvbXBvbmVudF0gKiAyNTUu MCArIDAuNSksIAogICAgICAgICAgICAgICAgICAgICAoaW50KShbY29sb3IgYmx1ZUNvbXBvbmVu dF0gKiAyNTUuMCArIDAuNSksIChpbnQpKFtjb2xvciBhbHBoYUNvbXBvbmVudF0gKiAyNTUuMCAr IDAuNSkpOwogfQo= 120204 2011-12-21 11:49:53 -0800 2011-12-22 02:19:58 -0800 Patch for fix and test with review corrections applied ColorDragV3.patch text/plain 3902 jalkut SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEwMzQx OCkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDExLTEy LTIxICBEYW5pZWwgSmFsa3V0ICA8amFsa3V0QHJlZC1zd2VhdGVyLmNvbT4KKworICAgICAgICBX ZWJLaXQgZWRpdGluZyB0aHJvd3MgZXhjZXB0aW9uIHdoZW4gbW9ub2Nocm9tZSBjb2xvciBkcmFn Z2VkIG9udG8gdGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzQ3NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIE1hbnVhbFRlc3RzL2RyYWctY29sb3ItdG8tY29udGVudGVkaXRhYmxlLmh0bWw6IEFk ZGVkLgorCiAyMDExLTEyLTIxICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4KIAog ICAgICAgICBBZGQgQ01ha2Ugb3B0aW9uIHRvIG9ubHkgYnVpbGQgSmF2YVNjcmlwdENvcmUKSW5k ZXg6IE1hbnVhbFRlc3RzL2RyYWctY29sb3ItdG8tY29udGVudGVkaXRhYmxlLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTWFudWFsVGVzdHMvZHJhZy1jb2xvci10by1jb250ZW50ZWRpdGFibGUuaHRtbAko cmV2aXNpb24gMCkKKysrIE1hbnVhbFRlc3RzL2RyYWctY29sb3ItdG8tY29udGVudGVkaXRhYmxl Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjUgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0 bWw+Cis8Ym9keT4KKzxwPjxiPkJVRyBJRDo8L2I+IDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDc3NSI+NzQ3NzU8L2E+IFdlYktpdCBlZGl0aW5nIHRo cm93cyBleGNlcHRpb24gd2hlbiBtb25vY2hyb21lIGNvbG9yIGRyYWdnZWQgb250byB0ZXh0PC9w PgorCis8cCBpZD0idGVzdCIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6c2t5Ymx1ZTsgcGFkZGlu ZzozcHg7Ij48Yj5TVEVQUyBUTyBURVNUOjwvYj4gCis8b2w+Cis8bGk+T3BlbiBhIGNvbG9yIHBh bmVsIGluIGFueSBhcHAsIHN1Y2ggYXMgVGV4dEVkaXQuYXBwLjwvbGk+Cis8bGk+U2VsZWN0IHNv bWUgdGV4dCBpbiB0aGUgZWRpdGFibGUgcmVnaW9uIGJlbG93LjwvbGk+Cis8bGk+RHJhZyBhIGNv bG9yIHN3YXRjaCBmb3IgYSBtb25vY2hyb21lIGNvbG9yLCBlLmcuIGEgZ3JheSBmcm9tIHRoZSBn cmF5c2NhbGUgc2xpZGVyIG9mIHRoZSBjb2xvciBwYW5lbCwgdG8gdGhlIHNlbGVjdGVkIHRleHQu PC9saT4KKzwvb2w+Cis8L3A+CisKKzxwIGlkPSJzdWNjZXNzIiBzdHlsZT0iYmFja2dyb3VuZC1j b2xvcjpwYWxlZ3JlZW47IHBhZGRpbmc6M3B4OyI+PGI+VEVTVCBQQVNTOjwvYj4gCitJZiB0aGUg Y29sb3IgY2hhbmdlcyB0byB0aGUgZGVzaXJlZCBncmF5LCBhbmQgdGhlIGRyYWcgYXBwZWFycyB0 byBiZSBhY2NlcHRlZCwgdGhlIHRlc3QgcGFzc2VzLgorPC9wPgorCis8cCBpZD0iZmFpbHVyZSIg c3R5bGU9ImJhY2tncm91bmQtY29sb3I6I0ZGMzMwMDsgcGFkZGluZzozcHg7Ij48Yj5URVNUIEZB SUw6PC9iPiAgCitJZiB0aGUgY29sb3IgY2hhbmdlIGRvZXMgbm90IGFwcGx5IHRvIHRoZSB0ZXh0 LCBhbmQgdGhlIGRyYWcgYXBwZWFycyB0byBib3VuY2UgYmFjaywgdGhlbiB0aGUgYnVnIGlzIHBy b2JhYmx5IG9jY3VycmluZy4gVGhlIGJ1ZyBjYW4gYmUgY29uZmlybWVkIGJ5IGxvb2tpbmcgZm9y IGV2aWRlbmNlIG9mIGFuIHVuY2F1Z2h0IGV4Y2VwdGlvbiBpbiB0aGUgc3lzdGVtIGNvbnNvbGUg bG9nLgorPC9wPgorCis8ZGl2IGNvbnRlbnRFZGl0YWJsZT0idHJ1ZSI+U2VsZWN0IHRoaXMgdGV4 dCBhbmQgZHJhZyBhIGdyYXlzY2FsZSBjb2xvciB0byBpdC48L2Rpdj4KKworPC9ib2R5PgorPC9o dG1sPgpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTAzNDE4KQorKysgU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMTItMjEgIERh bmllbCBKYWxrdXQgIDxqYWxrdXRAcmVkLXN3ZWF0ZXIuY29tPgorCisgICAgICAgIFdlYktpdCBl ZGl0aW5nIHRocm93cyBleGNlcHRpb24gd2hlbiBtb25vY2hyb21lIGNvbG9yIGRyYWdnZWQgb250 byB0ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 NDc3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhh bmRsZSBub24tUkdCIGNvbG9yc3BhY2UgY29sb3JzIGluIHRoZSBNYWMgcGxhdGZvcm0gZHJhZyBt YW5hZ2VyLiBGaXhlcyBOU0V4Y2VwdGlvbiB0aHJvd24gCisgICAgICAgIHdoZW4gZHJhZ2dpbmcg bW9ub2Nocm9tZSBjb2xvcnMgdG8gY29udGVudEVkaXRhYmxlIHJlZ2lvbnMuCisKKyAgICAgICAg TWFudWFsIHRlc3QgYWRkZWQgdG8gdHJ1bmsvTWFudWFsVGVzdHMvZHJhZy1jb2xvci10by1jb250 ZW50ZWRpdGFibGUuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vbWFjL0RyYWdEYXRhTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0RhdGE6OmFzQ29sb3IpOgorCiAyMDExLTEyLTIwICBB bmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogW0V4dGVuc2lvbiBBUEldIHJlZmFjdG9yIGV4dGVuc2lvbiBBUEkgYnVpbGQgY29kZSwg ZXhwb3NlIGV4cGVyaW1lbnRhbCBBUElzIGNvbmRpdGlvbmFsbHkgaW4gY2hyb21pdW0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9EcmFnRGF0YU1hYy5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvRHJhZ0RhdGFNYWMubW0JKHJldmlzaW9uIDEw MzMzOCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9EcmFnRGF0YU1hYy5tbQkod29y a2luZyBjb3B5KQpAQCAtMTEyLDYgKzExMiwxMiBAQCBTdHJpbmcgRHJhZ0RhdGE6OmFzUGxhaW5U ZXh0KEZyYW1lICpmcmFtCiBDb2xvciBEcmFnRGF0YTo6YXNDb2xvcigpIGNvbnN0CiB7CiAgICAg TlNDb2xvciAqY29sb3IgPSBbTlNDb2xvciBjb2xvckZyb21QYXN0ZWJvYXJkOm1fcGFzdGVib2Fy ZC5nZXQoKV07CisgICAgCisgICAgLy8gVGhlIGNvbG9yIG1heSBub3QgYmUgaW4gYW4gUkdCIGNv bG9yc3BhY2UuIFRoaXMgY29tbW9ubHkgb2NjdXJzIHdoZW4gYSBjb2xvciBpcyAKKyAgICAvLyBk cmFnZ2VkIGZyb20gdGhlIE5TQ29sb3JQYW5lbCBncmF5c2NhbGUgcGlja2VyLgorICAgIGlmIChb W2NvbG9yIGNvbG9yU3BhY2VdIGNvbG9yU3BhY2VNb2RlbF0gIT0gTlNSR0JDb2xvclNwYWNlTW9k ZWwpCisgICAgICAgIGNvbG9yID0gW2NvbG9yIGNvbG9yVXNpbmdDb2xvclNwYWNlTmFtZTpOU0Nh bGlicmF0ZWRSR0JDb2xvclNwYWNlXTsKKyAgICAKICAgICByZXR1cm4gbWFrZVJHQkEoKGludCko W2NvbG9yIHJlZENvbXBvbmVudF0gKiAyNTUuMCArIDAuNSksIChpbnQpKFtjb2xvciBncmVlbkNv bXBvbmVudF0gKiAyNTUuMCArIDAuNSksIAogICAgICAgICAgICAgICAgICAgICAoaW50KShbY29s b3IgYmx1ZUNvbXBvbmVudF0gKiAyNTUuMCArIDAuNSksIChpbnQpKFtjb2xvciBhbHBoYUNvbXBv bmVudF0gKiAyNTUuMCArIDAuNSkpOwogfQo=