37069 2010-04-03 21:35:13 -0700 [chromium] DragImage implementation for mac 2010-04-06 18:02:23 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 35811 1 thakis webkit-unassigned avi commit-queue eric webkit.review.bot oldest_to_newest 208321 0 thakis 2010-04-03 21:35:13 -0700 Mac side of https://bugs.webkit.org/show_bug.cgi?id=35811 . 208324 1 52503 thakis 2010-04-03 21:42:13 -0700 Created attachment 52503 Patch. This implements things on OS X. However, I hit a DCHECK, so this isn't ready for review. It sounds like the patch on the win/linux side has this problem as well, so the OS X patch in this bug is probably fine. ASSERTION FAILED: !m_doingDragAndDrop (/Users/thakis/src/chrome-git/src/third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp:1943 void WebKit::WebViewImpl::startDragging(const WebKit::WebDragData&, WebKit::WebDragOperationsMask, const WebKit::WebImage&, const WebKit::WebPoint&)) 208326 2 thakis 2010-04-03 21:44:33 -0700 Also needs http://codereview.chromium.org/1539018 (which can be landed independently) to function. 208327 3 52504 thakis 2010-04-03 21:48:29 -0700 Created attachment 52504 Patch without debugging fprintf. 208329 4 thakis 2010-04-03 22:45:43 -0700 The DCHECK was caused by an unrelated change in my tree. 208330 5 webkit.review.bot 2010-04-03 22:47:42 -0700 Attachment 52504 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/chromium/DragImageChromiumMac.cpp:60: Use 0 instead of NULL. [readability/null] [5] WebCore/platform/chromium/DragImageChromiumMac.cpp:77: Use 0 instead of NULL. [readability/null] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 208332 6 52505 thakis 2010-04-03 22:50:41 -0700 Created attachment 52505 Patch, address stylebot comments 208381 7 eric 2010-04-04 15:24:57 -0700 Bug 35811 is currently believed to cause chromium test regressions. Does this cause the regressions to go away? 209211 8 52662 thakis 2010-04-06 13:33:45 -0700 Created attachment 52662 Rebase, now that the dependency has landed. This is ready for review. 209244 9 avi 2010-04-06 14:25:53 -0700 Not authorized to actually comment on the patch directly; here are some thoughts: > Index: WebCore/platform/chromium/DragImageChromiumMac.cpp > =================================================================== > +#include <CoreGraphics/CGBitmapContext.h> > +#include <CoreGraphics/CGImage.h> Including headers of a sub-framework is discouraged. Try <ApplicationServices/ApplicationServices.h>. > DragImageRef scaleDragImage(DragImageRef image, FloatSize scale) > { ... > + size_t width = roundf(CGImageGetWidth(image) * scale.width()); > + size_t height = roundf(CGImageGetHeight(image) * scale.height()); > + CGContextRef context = CGBitmapContextCreate(0, width, height, 8, width * 4, CGImageGetColorSpace(image), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host); We usually only need to specify flags or byte ordering if we're hammering at the bitmap that we're creating. Since we're going straight to a CGImage, we probably don't need to specify anything special here. (And ditto for several similar uses below.) > + if (!context) > + return 0; > + CGContextDrawImage(context, CGRectMake(0, 0, width, height), image); > + CGImageRelease(image); I'm not familiar with the ownership context. Is the caller relinquishing ownership in a call named scaleDragImage? (And ditto for several similar uses below.) 209247 10 thakis 2010-04-06 14:33:10 -0700 > We usually only need to specify flags or byte ordering if we're hammering at > the bitmap that we're creating. Since we're going straight to a CGImage, we > probably don't need to specify anything special here. (And ditto for several > similar uses below.) Yes, but it's customary to specify this anyway. It's consistent if nothing else: $ ack 'CGImageCreate\(' third_party/WebKit/WebCore/ > > + if (!context) > > + return 0; > > + CGContextDrawImage(context, CGRectMake(0, 0, width, height), image); > > + CGImageRelease(image); > > I'm not familiar with the ownership context. Is the caller relinquishing > ownership in a call named scaleDragImage? (And ditto for several similar uses > below.) Yes, as far as I understand the code. This is called roughly like the following in WebCore/page/DragController.cpp: void DragController::doImageDrag() { ... dragImage = createDragImageFromImage(image)); ... dragImage = fitDragImageToMaxSize(dragImage, rect.size(), maxDragImageSize()); // calls the scale method ... deleteDragImage(dragImage); } This means the scale method needs to delete its argument. The windows version of the class does that too. 209257 11 avi 2010-04-06 14:44:55 -0700 (In reply to comment #10) > Yes, but it's customary to specify this anyway. OK. > > Is the caller relinquishing > > ownership in a call named scaleDragImage? > Yes, as far as I understand the code. Great! LGTM 209271 12 52662 dglazkov 2010-04-06 15:00:37 -0700 Comment on attachment 52662 Rebase, now that the dependency has landed. in avi we trust. 209363 13 52662 commit-queue 2010-04-06 18:02:18 -0700 Comment on attachment 52662 Rebase, now that the dependency has landed. Clearing flags on attachment: 52662 Committed r57180: <http://trac.webkit.org/changeset/57180> 209364 14 commit-queue 2010-04-06 18:02:23 -0700 All reviewed patches have been landed. Closing bug. 52503 2010-04-03 21:42:13 -0700 2010-04-03 21:48:29 -0700 Patch. webkit_osxdragimg.diff text/plain 6979 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzA1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMDMgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEltcGxlbWVudCBEcmFnSW1hZ2UgZnVuY3Rpb25hbGl0eSBmb3IgY2hyb21pdW0vbWFjLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjkKKworICAg ICAgICAqIHBhZ2UvY2hyb21pdW0vRHJhZ0NvbnRyb2xsZXJDaHJvbWl1bS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6bWF4RHJhZ0ltYWdlU2l6ZSk6CisgICAgICAgIFVz ZSBhIG1heCBzaXplIG9mIDQwMHg0MDAgb24gT1MgWC4KKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJv bWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmFnSW1h Z2VTaXplKTogSW1wbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlRHJhZ0ltYWdlKTog SW1wbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6c2NhbGVEcmFnSW1hZ2UpOiBJbXBsZW1lbnQu CisgICAgICAgIChXZWJDb3JlOjpkaXNzb2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24pOiBJbXBsZW1l bnQuCisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVEcmFnSW1hZ2VGcm9tSW1hZ2UpOiBJbXBsZW1l bnQuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlUmVmLmg6CisgICAgICAg IFVzZSBDR0ltYWdlUmVmcyBhcyBEcmFnSW1hZ2VSZWYgb24gT1MgWC4KKwogMjAxMC0wNC0wMyAg eWFlbCBhaGFyb24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3BhZ2UvY2hyb21pdW0vRHJhZ0NvbnRyb2xs ZXJDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2Nocm9taXVtL0RyYWdD b250cm9sbGVyQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA1NzA1NCkKKysrIFdlYkNvcmUvcGFnZS9j aHJvbWl1bS9EcmFnQ29udHJvbGxlckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYs NyArNjYsMTIgQEAgYm9vbCBEcmFnQ29udHJvbGxlcjo6aXNDb3B5S2V5RG93bigpCiAgICAgCiBj b25zdCBJbnRTaXplJiBEcmFnQ29udHJvbGxlcjo6bWF4RHJhZ0ltYWdlU2l6ZSgpCiB7CisjaWYg T1MoREFSV0lOKQorICAgIC8vIE1hdGNoIFNhZmFyaSdzIGRyYWcgaW1hZ2Ugc2l6ZS4KKyAgICBz dGF0aWMgY29uc3QgSW50U2l6ZSBtYXhEcmFnSW1hZ2VTaXplKDQwMCwgNDAwKTsKKyNlbHNlCiAg ICAgc3RhdGljIGNvbnN0IEludFNpemUgbWF4RHJhZ0ltYWdlU2l6ZSgyMDAsIDIwMCk7CisjZW5k aWYKICAgICByZXR1cm4gbWF4RHJhZ0ltYWdlU2l6ZTsKIH0KIApJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHAJKHJldmlzaW9u IDU3MDU0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1h Yy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDM3ICszMSw3MSBAQAogI2luY2x1ZGUgImNvbmZp Zy5oIgogI2luY2x1ZGUgIkRyYWdJbWFnZS5oIgogCisjaW5jbHVkZSAiSW1hZ2UuaCIKICNpbmNs dWRlICJOb3RJbXBsZW1lbnRlZC5oIgogCisjaW5jbHVkZSA8Q29yZUdyYXBoaWNzL0NHQml0bWFw Q29udGV4dC5oPgorI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0ltYWdlLmg+CisKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogSW50U2l6ZSBkcmFnSW1hZ2VTaXplKERyYWdJbWFnZVJlZiBpbWFnZSkK IHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBJbnRTaXplKCk7CisgICAgaWYg KCFpbWFnZSkKKyAgICAgICAgcmV0dXJuIEludFNpemUoKTsKKyAgICByZXR1cm4gSW50U2l6ZShD R0ltYWdlR2V0V2lkdGgoaW1hZ2UpLCBDR0ltYWdlR2V0SGVpZ2h0KGltYWdlKSk7CiB9CiAKIHZv aWQgZGVsZXRlRHJhZ0ltYWdlKERyYWdJbWFnZVJlZiBpbWFnZSkKIHsKLSAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIENHSW1hZ2VSZWxlYXNlKGltYWdlKTsKIH0KIAogRHJhZ0ltYWdlUmVmIHNj YWxlRHJhZ0ltYWdlKERyYWdJbWFnZVJlZiBpbWFnZSwgRmxvYXRTaXplIHNjYWxlKQogewotICAg IG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIDA7Ci19Ci0KLURyYWdJbWFnZVJlZiBkaXNz b2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24oRHJhZ0ltYWdlUmVmIGltYWdlLCBmbG9hdCkKLXsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBpbWFnZTsKLX0KLQotRHJhZ0ltYWdlUmVm IGNyZWF0ZURyYWdJbWFnZUZyb21JbWFnZShJbWFnZSogaW1nKQotewotICAgIG5vdEltcGxlbWVu dGVkKCk7Ci0gICAgcmV0dXJuIDA7CisgICAgaWYgKCFpbWFnZSkKKyAgICAgICAgcmV0dXJuIDA7 CisgICAgc2l6ZV90IHdpZHRoID0gcm91bmRmKENHSW1hZ2VHZXRXaWR0aChpbWFnZSkgKiBzY2Fs ZS53aWR0aCgpKTsKKyAgICBzaXplX3QgaGVpZ2h0ID0gcm91bmRmKENHSW1hZ2VHZXRIZWlnaHQo aW1hZ2UpICogc2NhbGUuaGVpZ2h0KCkpOworICAgIENHQ29udGV4dFJlZiBjb250ZXh0ID0gQ0dC aXRtYXBDb250ZXh0Q3JlYXRlKE5VTEwsIHdpZHRoLCBoZWlnaHQsIDgsIHdpZHRoICogNCwgQ0dJ bWFnZUdldENvbG9yU3BhY2UoaW1hZ2UpLCBrQ0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZEZpcnN0 IHwga0NHQml0bWFwQnl0ZU9yZGVyMzJIb3N0KTsKKyAgICBpZiAoIWNvbnRleHQpCisgICAgICAg IHJldHVybiAwOworICAgIENHQ29udGV4dERyYXdJbWFnZShjb250ZXh0LCBDR1JlY3RNYWtlKDAs IDAsIHdpZHRoLCBoZWlnaHQpLCBpbWFnZSk7CisgICAgQ0dJbWFnZVJlbGVhc2UoaW1hZ2UpOwor CisgICAgQ0dJbWFnZVJlZiBzY2FsZWRJbWFnZSA9IENHQml0bWFwQ29udGV4dENyZWF0ZUltYWdl KGNvbnRleHQpOworICAgIENHQ29udGV4dFJlbGVhc2UoY29udGV4dCk7CisgICAgcmV0dXJuIHNj YWxlZEltYWdlOworfQorCitEcmFnSW1hZ2VSZWYgZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9u KERyYWdJbWFnZVJlZiBpbWFnZSwgZmxvYXQgZGVsdGEpCit7CisgICAgaWYgKCFpbWFnZSkKKyAg ICAgICAgcmV0dXJuIDA7CisgICAgc2l6ZV90IHdpZHRoID0gQ0dJbWFnZUdldFdpZHRoKGltYWdl KTsKKyAgICBzaXplX3QgaGVpZ2h0ID0gQ0dJbWFnZUdldEhlaWdodChpbWFnZSk7CisgICAgQ0dD b250ZXh0UmVmIGNvbnRleHQgPSBDR0JpdG1hcENvbnRleHRDcmVhdGUoTlVMTCwgd2lkdGgsIGhl aWdodCwgOCwgd2lkdGggKiA0LCBDR0ltYWdlR2V0Q29sb3JTcGFjZShpbWFnZSksIGtDR0ltYWdl QWxwaGFQcmVtdWx0aXBsaWVkRmlyc3QgfCBrQ0dCaXRtYXBCeXRlT3JkZXIzMkhvc3QpOworICAg IGlmICghY29udGV4dCkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgLy8gRnJvbSBDR0NvbnRleHQu aDoKKyAgICAvLyAgICAgVGhlIFBvcnRlci1EdWZmICJzb3VyY2Ugb3ZlciIgbW9kZSBpcyBjYWxs ZWQgYGtDR0JsZW5kTW9kZU5vcm1hbCc6CisgICAgLy8gICAgICAgUiA9IFMgKyBEKigxIC0gU2Ep CisgICAgLy8gIFRoaXMgaXMgdGhlIHNhbWUgYXMgTlNDb21wb3NpdGVTb3VyY2VPdmVyLCB3aGlj aCBpcyB3aGF0IC1bTlNJbWFnZSBkaXNzb2x2ZVRvUG9pbnQ6ZnJhY3Rpb246XSB1c2VzLgorICAg IENHQ29udGV4dFNldEFscGhhKGNvbnRleHQsIGRlbHRhKTsKKyAgICBDR0NvbnRleHRTZXRCbGVu ZE1vZGUoY29udGV4dCwga0NHQmxlbmRNb2RlTm9ybWFsKTsKKyAgICBDR0NvbnRleHREcmF3SW1h Z2UoY29udGV4dCwgQ0dSZWN0TWFrZSgwLCAwLCB3aWR0aCwgaGVpZ2h0KSwgaW1hZ2UpOworICAg IENHSW1hZ2VSZWxlYXNlKGltYWdlKTsKKworICAgIENHSW1hZ2VSZWYgZGlzc29sdmVkSW1hZ2Ug PSBDR0JpdG1hcENvbnRleHRDcmVhdGVJbWFnZShjb250ZXh0KTsKKyAgICBDR0NvbnRleHRSZWxl YXNlKGNvbnRleHQpOworICAgIHJldHVybiBkaXNzb2x2ZWRJbWFnZTsKK30KKworRHJhZ0ltYWdl UmVmIGNyZWF0ZURyYWdJbWFnZUZyb21JbWFnZShJbWFnZSogaW1hZ2UpCit7CisgICAgaWYgKCFp bWFnZSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIENHSW1hZ2VDcmVhdGVDb3B5KGlt YWdlLT5uYXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpKTsKIH0KIAogRHJhZ0ltYWdlUmVmIGNy ZWF0ZURyYWdJbWFnZUljb25Gb3JDYWNoZWRJbWFnZShDYWNoZWRJbWFnZSopCkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL0RyYWdJbWFnZVJlZi5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlUmVmLmgJKHJldmlzaW9uIDU3MDU0KQorKysg V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VSZWYuaAkod29ya2luZyBjb3B5KQpA QCAtMjksMTMgKzI5LDE2IEBACiAjaWZuZGVmIERyYWdJbWFnZVJlZl9oCiAjZGVmaW5lIERyYWdJ bWFnZVJlZl9oCiAKKyNpZiBPUyhEQVJXSU4pCit0eXBlZGVmIHN0cnVjdCBDR0ltYWdlKiBDR0lt YWdlUmVmOworI2Vsc2UKIGNsYXNzIFNrQml0bWFwOworI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogI2lmIE9TKERBUldJTikKLS8vIEZJWE1FOiBub3QgaW1wbGVtZW50ZWQuCi10eXBl ZGVmIHZvaWQqIERyYWdJbWFnZVJlZjsKK3R5cGVkZWYgQ0dJbWFnZVJlZiBEcmFnSW1hZ2VSZWY7 CiAjZWxzZQogdHlwZWRlZiBTa0JpdG1hcCogRHJhZ0ltYWdlUmVmOwogI2VuZGlmCkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHJldmlzaW9uIDU3MDU0KQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEwLTA0LTAzICBOaWNvbGFzIFdlYmVy ICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVc2UgZHJhZyBpbWFnZXMgb24gT1MgWCBhcyB3ZWxsLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjkKKworICAgICAg ICAqIHNyYy9EcmFnQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYWdDbGllbnRJ bXBsOjpzdGFydERyYWcpOgorCiAyMDEwLTA0LTAzICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgQWRkIGRlZmF1bHQgaW1wbGVtZW50YXRpb25zIG9mIFdlYk5v dGlmaWNhdGlvblByZXNlbnRlciBtZXRob2RzIHRvCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L0RyYWdDbGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0Ry YWdDbGllbnRJbXBsLmNwcAkocmV2aXNpb24gNTcwNTQpCisrKyBXZWJLaXQvY2hyb21pdW0vc3Jj L0RyYWdDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODQsMTkgKzg0LDE3IEBAIHZv aWQgRHJhZ0NsaWVudEltcGw6OnN0YXJ0RHJhZyhEcmFnSW1hZ2UKIAogICAgIERyYWdPcGVyYXRp b24gZHJhZ09wZXJhdGlvbk1hc2sgPSBjbGlwYm9hcmQtPnNvdXJjZU9wZXJhdGlvbigpOwogCitm cHJpbnRmKHN0ZGVyciwgInN0YXJ0RHJhZzogJXBcbiIsIGRyYWdJbWFnZSk7CiAgICAgSW50U2l6 ZSBvZmZzZXRTaXplKGV2ZW50UG9zIC0gZHJhZ0ltYWdlT3JpZ2luKTsKICAgICBXZWJQb2ludCBv ZmZzZXRQb2ludChvZmZzZXRTaXplLndpZHRoKCksIG9mZnNldFNpemUuaGVpZ2h0KCkpOwotI2lm IFdFQktJVF9VU0lOR19TS0lBCiAgICAgbV93ZWJWaWV3LT5zdGFydERyYWdnaW5nKAogICAgICAg ICBkcmFnRGF0YSwgc3RhdGljX2Nhc3Q8V2ViRHJhZ09wZXJhdGlvbnNNYXNrPihkcmFnT3BlcmF0 aW9uTWFzayksCi0gICAgICAgIFdlYkltYWdlKCpkcmFnSW1hZ2UpLCBvZmZzZXRQb2ludCk7Cisj aWYgV0VCS0lUX1VTSU5HX1NLSUEKKyAgICAgICAgV2ViSW1hZ2UoKmRyYWdJbWFnZSksCiAjZWxz ZQotICAgIC8vIEZJWE1FOiBXaGVuIERyYWdJbWFnZVJlZiBpcyBpbXBsZW1lbnRlZCBmb3IgQ0cs IHdlIGNhbiBwcm9iYWJseSBqdXN0IHJlbW92ZQotICAgIC8vIHRoaXMgI2lmIGZvcmsuIEZvciBu b3csIHBhc3MgYW4gZW1wdHkgaW1hZ2UuCi0gICAgbV93ZWJWaWV3LT5zdGFydERyYWdnaW5nKAot ICAgICAgICBkcmFnRGF0YSwgc3RhdGljX2Nhc3Q8V2ViRHJhZ09wZXJhdGlvbnNNYXNrPihkcmFn T3BlcmF0aW9uTWFzayksCi0gICAgICAgIFdlYkltYWdlKCksIFdlYlBvaW50KCkpOworICAgICAg ICBXZWJJbWFnZSgpLAogI2VuZGlmCisgICAgICAgIG9mZnNldFBvaW50KTsKIH0KIAogRHJhZ0lt YWdlUmVmIERyYWdDbGllbnRJbXBsOjpjcmVhdGVEcmFnSW1hZ2VGb3JMaW5rKEtVUkwmLCBjb25z dCBTdHJpbmcmIGxhYmVsLCBGcmFtZSopCg== 52504 2010-04-03 21:48:29 -0700 2010-04-03 22:50:41 -0700 Patch without debugging fprintf. webkit_osxdragimg.diff text/plain 6860 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzA1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMDMgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEltcGxlbWVudCBEcmFnSW1hZ2UgZnVuY3Rpb25hbGl0eSBmb3IgY2hyb21pdW0vbWFjLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjkKKworICAg ICAgICAqIHBhZ2UvY2hyb21pdW0vRHJhZ0NvbnRyb2xsZXJDaHJvbWl1bS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6bWF4RHJhZ0ltYWdlU2l6ZSk6CisgICAgICAgIFVz ZSBhIG1heCBzaXplIG9mIDQwMHg0MDAgb24gT1MgWC4KKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJv bWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmFnSW1h Z2VTaXplKTogSW1wbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlRHJhZ0ltYWdlKTog SW1wbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6c2NhbGVEcmFnSW1hZ2UpOiBJbXBsZW1lbnQu CisgICAgICAgIChXZWJDb3JlOjpkaXNzb2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24pOiBJbXBsZW1l bnQuCisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVEcmFnSW1hZ2VGcm9tSW1hZ2UpOiBJbXBsZW1l bnQuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlUmVmLmg6CisgICAgICAg IFVzZSBDR0ltYWdlUmVmcyBhcyBEcmFnSW1hZ2VSZWYgb24gT1MgWC4KKwogMjAxMC0wNC0wMyAg eWFlbCBhaGFyb24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3BhZ2UvY2hyb21pdW0vRHJhZ0NvbnRyb2xs ZXJDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2Nocm9taXVtL0RyYWdD b250cm9sbGVyQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA1NzA1NCkKKysrIFdlYkNvcmUvcGFnZS9j aHJvbWl1bS9EcmFnQ29udHJvbGxlckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYs NyArNjYsMTIgQEAgYm9vbCBEcmFnQ29udHJvbGxlcjo6aXNDb3B5S2V5RG93bigpCiAgICAgCiBj b25zdCBJbnRTaXplJiBEcmFnQ29udHJvbGxlcjo6bWF4RHJhZ0ltYWdlU2l6ZSgpCiB7CisjaWYg T1MoREFSV0lOKQorICAgIC8vIE1hdGNoIFNhZmFyaSdzIGRyYWcgaW1hZ2Ugc2l6ZS4KKyAgICBz dGF0aWMgY29uc3QgSW50U2l6ZSBtYXhEcmFnSW1hZ2VTaXplKDQwMCwgNDAwKTsKKyNlbHNlCiAg ICAgc3RhdGljIGNvbnN0IEludFNpemUgbWF4RHJhZ0ltYWdlU2l6ZSgyMDAsIDIwMCk7CisjZW5k aWYKICAgICByZXR1cm4gbWF4RHJhZ0ltYWdlU2l6ZTsKIH0KIApJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHAJKHJldmlzaW9u IDU3MDU0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1h Yy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDM3ICszMSw3MSBAQAogI2luY2x1ZGUgImNvbmZp Zy5oIgogI2luY2x1ZGUgIkRyYWdJbWFnZS5oIgogCisjaW5jbHVkZSAiSW1hZ2UuaCIKICNpbmNs dWRlICJOb3RJbXBsZW1lbnRlZC5oIgogCisjaW5jbHVkZSA8Q29yZUdyYXBoaWNzL0NHQml0bWFw Q29udGV4dC5oPgorI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0ltYWdlLmg+CisKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogSW50U2l6ZSBkcmFnSW1hZ2VTaXplKERyYWdJbWFnZVJlZiBpbWFnZSkK IHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBJbnRTaXplKCk7CisgICAgaWYg KCFpbWFnZSkKKyAgICAgICAgcmV0dXJuIEludFNpemUoKTsKKyAgICByZXR1cm4gSW50U2l6ZShD R0ltYWdlR2V0V2lkdGgoaW1hZ2UpLCBDR0ltYWdlR2V0SGVpZ2h0KGltYWdlKSk7CiB9CiAKIHZv aWQgZGVsZXRlRHJhZ0ltYWdlKERyYWdJbWFnZVJlZiBpbWFnZSkKIHsKLSAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIENHSW1hZ2VSZWxlYXNlKGltYWdlKTsKIH0KIAogRHJhZ0ltYWdlUmVmIHNj YWxlRHJhZ0ltYWdlKERyYWdJbWFnZVJlZiBpbWFnZSwgRmxvYXRTaXplIHNjYWxlKQogewotICAg IG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIDA7Ci19Ci0KLURyYWdJbWFnZVJlZiBkaXNz b2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24oRHJhZ0ltYWdlUmVmIGltYWdlLCBmbG9hdCkKLXsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBpbWFnZTsKLX0KLQotRHJhZ0ltYWdlUmVm IGNyZWF0ZURyYWdJbWFnZUZyb21JbWFnZShJbWFnZSogaW1nKQotewotICAgIG5vdEltcGxlbWVu dGVkKCk7Ci0gICAgcmV0dXJuIDA7CisgICAgaWYgKCFpbWFnZSkKKyAgICAgICAgcmV0dXJuIDA7 CisgICAgc2l6ZV90IHdpZHRoID0gcm91bmRmKENHSW1hZ2VHZXRXaWR0aChpbWFnZSkgKiBzY2Fs ZS53aWR0aCgpKTsKKyAgICBzaXplX3QgaGVpZ2h0ID0gcm91bmRmKENHSW1hZ2VHZXRIZWlnaHQo aW1hZ2UpICogc2NhbGUuaGVpZ2h0KCkpOworICAgIENHQ29udGV4dFJlZiBjb250ZXh0ID0gQ0dC aXRtYXBDb250ZXh0Q3JlYXRlKE5VTEwsIHdpZHRoLCBoZWlnaHQsIDgsIHdpZHRoICogNCwgQ0dJ bWFnZUdldENvbG9yU3BhY2UoaW1hZ2UpLCBrQ0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZEZpcnN0 IHwga0NHQml0bWFwQnl0ZU9yZGVyMzJIb3N0KTsKKyAgICBpZiAoIWNvbnRleHQpCisgICAgICAg IHJldHVybiAwOworICAgIENHQ29udGV4dERyYXdJbWFnZShjb250ZXh0LCBDR1JlY3RNYWtlKDAs IDAsIHdpZHRoLCBoZWlnaHQpLCBpbWFnZSk7CisgICAgQ0dJbWFnZVJlbGVhc2UoaW1hZ2UpOwor CisgICAgQ0dJbWFnZVJlZiBzY2FsZWRJbWFnZSA9IENHQml0bWFwQ29udGV4dENyZWF0ZUltYWdl KGNvbnRleHQpOworICAgIENHQ29udGV4dFJlbGVhc2UoY29udGV4dCk7CisgICAgcmV0dXJuIHNj YWxlZEltYWdlOworfQorCitEcmFnSW1hZ2VSZWYgZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9u KERyYWdJbWFnZVJlZiBpbWFnZSwgZmxvYXQgZGVsdGEpCit7CisgICAgaWYgKCFpbWFnZSkKKyAg ICAgICAgcmV0dXJuIDA7CisgICAgc2l6ZV90IHdpZHRoID0gQ0dJbWFnZUdldFdpZHRoKGltYWdl KTsKKyAgICBzaXplX3QgaGVpZ2h0ID0gQ0dJbWFnZUdldEhlaWdodChpbWFnZSk7CisgICAgQ0dD b250ZXh0UmVmIGNvbnRleHQgPSBDR0JpdG1hcENvbnRleHRDcmVhdGUoTlVMTCwgd2lkdGgsIGhl aWdodCwgOCwgd2lkdGggKiA0LCBDR0ltYWdlR2V0Q29sb3JTcGFjZShpbWFnZSksIGtDR0ltYWdl QWxwaGFQcmVtdWx0aXBsaWVkRmlyc3QgfCBrQ0dCaXRtYXBCeXRlT3JkZXIzMkhvc3QpOworICAg IGlmICghY29udGV4dCkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgLy8gRnJvbSBDR0NvbnRleHQu aDoKKyAgICAvLyAgICAgVGhlIFBvcnRlci1EdWZmICJzb3VyY2Ugb3ZlciIgbW9kZSBpcyBjYWxs ZWQgYGtDR0JsZW5kTW9kZU5vcm1hbCc6CisgICAgLy8gICAgICAgUiA9IFMgKyBEKigxIC0gU2Ep CisgICAgLy8gIFRoaXMgaXMgdGhlIHNhbWUgYXMgTlNDb21wb3NpdGVTb3VyY2VPdmVyLCB3aGlj aCBpcyB3aGF0IC1bTlNJbWFnZSBkaXNzb2x2ZVRvUG9pbnQ6ZnJhY3Rpb246XSB1c2VzLgorICAg IENHQ29udGV4dFNldEFscGhhKGNvbnRleHQsIGRlbHRhKTsKKyAgICBDR0NvbnRleHRTZXRCbGVu ZE1vZGUoY29udGV4dCwga0NHQmxlbmRNb2RlTm9ybWFsKTsKKyAgICBDR0NvbnRleHREcmF3SW1h Z2UoY29udGV4dCwgQ0dSZWN0TWFrZSgwLCAwLCB3aWR0aCwgaGVpZ2h0KSwgaW1hZ2UpOworICAg IENHSW1hZ2VSZWxlYXNlKGltYWdlKTsKKworICAgIENHSW1hZ2VSZWYgZGlzc29sdmVkSW1hZ2Ug PSBDR0JpdG1hcENvbnRleHRDcmVhdGVJbWFnZShjb250ZXh0KTsKKyAgICBDR0NvbnRleHRSZWxl YXNlKGNvbnRleHQpOworICAgIHJldHVybiBkaXNzb2x2ZWRJbWFnZTsKK30KKworRHJhZ0ltYWdl UmVmIGNyZWF0ZURyYWdJbWFnZUZyb21JbWFnZShJbWFnZSogaW1hZ2UpCit7CisgICAgaWYgKCFp bWFnZSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIENHSW1hZ2VDcmVhdGVDb3B5KGlt YWdlLT5uYXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpKTsKIH0KIAogRHJhZ0ltYWdlUmVmIGNy ZWF0ZURyYWdJbWFnZUljb25Gb3JDYWNoZWRJbWFnZShDYWNoZWRJbWFnZSopCkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL0RyYWdJbWFnZVJlZi5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlUmVmLmgJKHJldmlzaW9uIDU3MDU0KQorKysg V2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VSZWYuaAkod29ya2luZyBjb3B5KQpA QCAtMjksMTMgKzI5LDE2IEBACiAjaWZuZGVmIERyYWdJbWFnZVJlZl9oCiAjZGVmaW5lIERyYWdJ bWFnZVJlZl9oCiAKKyNpZiBPUyhEQVJXSU4pCit0eXBlZGVmIHN0cnVjdCBDR0ltYWdlKiBDR0lt YWdlUmVmOworI2Vsc2UKIGNsYXNzIFNrQml0bWFwOworI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogI2lmIE9TKERBUldJTikKLS8vIEZJWE1FOiBub3QgaW1wbGVtZW50ZWQuCi10eXBl ZGVmIHZvaWQqIERyYWdJbWFnZVJlZjsKK3R5cGVkZWYgQ0dJbWFnZVJlZiBEcmFnSW1hZ2VSZWY7 CiAjZWxzZQogdHlwZWRlZiBTa0JpdG1hcCogRHJhZ0ltYWdlUmVmOwogI2VuZGlmCkluZGV4OiBX ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cJKHJldmlzaW9uIDU3MDU0KQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEwLTA0LTAzICBOaWNvbGFzIFdlYmVy ICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBVc2UgZHJhZyBpbWFnZXMgb24gT1MgWCBhcyB3ZWxsLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjkKKworICAgICAg ICAqIHNyYy9EcmFnQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYWdDbGllbnRJ bXBsOjpzdGFydERyYWcpOgorCiAyMDEwLTA0LTAzICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgQWRkIGRlZmF1bHQgaW1wbGVtZW50YXRpb25zIG9mIFdlYk5v dGlmaWNhdGlvblByZXNlbnRlciBtZXRob2RzIHRvCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3Jj L0RyYWdDbGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0Ry YWdDbGllbnRJbXBsLmNwcAkocmV2aXNpb24gNTcwNTQpCisrKyBXZWJLaXQvY2hyb21pdW0vc3Jj L0RyYWdDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODYsMTcgKzg2LDE0IEBAIHZv aWQgRHJhZ0NsaWVudEltcGw6OnN0YXJ0RHJhZyhEcmFnSW1hZ2UKIAogICAgIEludFNpemUgb2Zm c2V0U2l6ZShldmVudFBvcyAtIGRyYWdJbWFnZU9yaWdpbik7CiAgICAgV2ViUG9pbnQgb2Zmc2V0 UG9pbnQob2Zmc2V0U2l6ZS53aWR0aCgpLCBvZmZzZXRTaXplLmhlaWdodCgpKTsKLSNpZiBXRUJL SVRfVVNJTkdfU0tJQQogICAgIG1fd2ViVmlldy0+c3RhcnREcmFnZ2luZygKICAgICAgICAgZHJh Z0RhdGEsIHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb25zTWFzaz4oZHJhZ09wZXJhdGlvbk1h c2spLAotICAgICAgICBXZWJJbWFnZSgqZHJhZ0ltYWdlKSwgb2Zmc2V0UG9pbnQpOworI2lmIFdF QktJVF9VU0lOR19TS0lBCisgICAgICAgIFdlYkltYWdlKCpkcmFnSW1hZ2UpLAogI2Vsc2UKLSAg ICAvLyBGSVhNRTogV2hlbiBEcmFnSW1hZ2VSZWYgaXMgaW1wbGVtZW50ZWQgZm9yIENHLCB3ZSBj YW4gcHJvYmFibHkganVzdCByZW1vdmUKLSAgICAvLyB0aGlzICNpZiBmb3JrLiBGb3Igbm93LCBw YXNzIGFuIGVtcHR5IGltYWdlLgotICAgIG1fd2ViVmlldy0+c3RhcnREcmFnZ2luZygKLSAgICAg ICAgZHJhZ0RhdGEsIHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb25zTWFzaz4oZHJhZ09wZXJh dGlvbk1hc2spLAotICAgICAgICBXZWJJbWFnZSgpLCBXZWJQb2ludCgpKTsKKyAgICAgICAgV2Vi SW1hZ2UoKSwKICNlbmRpZgorICAgICAgICBvZmZzZXRQb2ludCk7CiB9CiAKIERyYWdJbWFnZVJl ZiBEcmFnQ2xpZW50SW1wbDo6Y3JlYXRlRHJhZ0ltYWdlRm9yTGluayhLVVJMJiwgY29uc3QgU3Ry aW5nJiBsYWJlbCwgRnJhbWUqKQo= 52505 2010-04-03 22:50:41 -0700 2010-04-06 13:33:45 -0700 Patch, address stylebot comments webkit_osxdragimg.diff text/plain 6854 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzA1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMDMgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEltcGxlbWVudCBEcmFnSW1hZ2UgZnVuY3Rpb25hbGl0eSBmb3IgY2hyb21pdW0vbWFjLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjkKKworICAg ICAgICAqIHBhZ2UvY2hyb21pdW0vRHJhZ0NvbnRyb2xsZXJDaHJvbWl1bS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6bWF4RHJhZ0ltYWdlU2l6ZSk6CisgICAgICAgIFVz ZSBhIG1heCBzaXplIG9mIDQwMHg0MDAgb24gT1MgWC4KKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJv bWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmFnSW1h Z2VTaXplKTogSW1wbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlRHJhZ0ltYWdlKTog SW1wbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6c2NhbGVEcmFnSW1hZ2UpOiBJbXBsZW1lbnQu CisgICAgICAgIChXZWJDb3JlOjpkaXNzb2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24pOiBJbXBsZW1l bnQuCisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVEcmFnSW1hZ2VGcm9tSW1hZ2UpOiBJbXBsZW1l bnQuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlUmVmLmg6CisgICAgICAg IFVzZSBDR0ltYWdlUmVmcyBhcyBEcmFnSW1hZ2VSZWYgb24gT1MgWC4KKwogMjAxMC0wNC0wMyAg eWFlbCBhaGFyb24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3BhZ2UvY2hyb21pdW0vRHJhZ0NvbnRyb2xs ZXJDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL2Nocm9taXVtL0RyYWdD b250cm9sbGVyQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA1NzA1NCkKKysrIFdlYkNvcmUvcGFnZS9j aHJvbWl1bS9EcmFnQ29udHJvbGxlckNocm9taXVtLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYs NyArNjYsMTIgQEAgYm9vbCBEcmFnQ29udHJvbGxlcjo6aXNDb3B5S2V5RG93bigpCiAgICAgCiBj b25zdCBJbnRTaXplJiBEcmFnQ29udHJvbGxlcjo6bWF4RHJhZ0ltYWdlU2l6ZSgpCiB7CisjaWYg T1MoREFSV0lOKQorICAgIC8vIE1hdGNoIFNhZmFyaSdzIGRyYWcgaW1hZ2Ugc2l6ZS4KKyAgICBz dGF0aWMgY29uc3QgSW50U2l6ZSBtYXhEcmFnSW1hZ2VTaXplKDQwMCwgNDAwKTsKKyNlbHNlCiAg ICAgc3RhdGljIGNvbnN0IEludFNpemUgbWF4RHJhZ0ltYWdlU2l6ZSgyMDAsIDIwMCk7CisjZW5k aWYKICAgICByZXR1cm4gbWF4RHJhZ0ltYWdlU2l6ZTsKIH0KIApJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHAJKHJldmlzaW9u IDU3MDU0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1h Yy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDM3ICszMSw3MSBAQAogI2luY2x1ZGUgImNvbmZp Zy5oIgogI2luY2x1ZGUgIkRyYWdJbWFnZS5oIgogCisjaW5jbHVkZSAiSW1hZ2UuaCIKICNpbmNs dWRlICJOb3RJbXBsZW1lbnRlZC5oIgogCisjaW5jbHVkZSA8Q29yZUdyYXBoaWNzL0NHQml0bWFw Q29udGV4dC5oPgorI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0ltYWdlLmg+CisKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogSW50U2l6ZSBkcmFnSW1hZ2VTaXplKERyYWdJbWFnZVJlZiBpbWFnZSkK IHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBJbnRTaXplKCk7CisgICAgaWYg KCFpbWFnZSkKKyAgICAgICAgcmV0dXJuIEludFNpemUoKTsKKyAgICByZXR1cm4gSW50U2l6ZShD R0ltYWdlR2V0V2lkdGgoaW1hZ2UpLCBDR0ltYWdlR2V0SGVpZ2h0KGltYWdlKSk7CiB9CiAKIHZv aWQgZGVsZXRlRHJhZ0ltYWdlKERyYWdJbWFnZVJlZiBpbWFnZSkKIHsKLSAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIENHSW1hZ2VSZWxlYXNlKGltYWdlKTsKIH0KIAogRHJhZ0ltYWdlUmVmIHNj YWxlRHJhZ0ltYWdlKERyYWdJbWFnZVJlZiBpbWFnZSwgRmxvYXRTaXplIHNjYWxlKQogewotICAg IG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIDA7Ci19Ci0KLURyYWdJbWFnZVJlZiBkaXNz b2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24oRHJhZ0ltYWdlUmVmIGltYWdlLCBmbG9hdCkKLXsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBpbWFnZTsKLX0KLQotRHJhZ0ltYWdlUmVm IGNyZWF0ZURyYWdJbWFnZUZyb21JbWFnZShJbWFnZSogaW1nKQotewotICAgIG5vdEltcGxlbWVu dGVkKCk7Ci0gICAgcmV0dXJuIDA7CisgICAgaWYgKCFpbWFnZSkKKyAgICAgICAgcmV0dXJuIDA7 CisgICAgc2l6ZV90IHdpZHRoID0gcm91bmRmKENHSW1hZ2VHZXRXaWR0aChpbWFnZSkgKiBzY2Fs ZS53aWR0aCgpKTsKKyAgICBzaXplX3QgaGVpZ2h0ID0gcm91bmRmKENHSW1hZ2VHZXRIZWlnaHQo aW1hZ2UpICogc2NhbGUuaGVpZ2h0KCkpOworICAgIENHQ29udGV4dFJlZiBjb250ZXh0ID0gQ0dC aXRtYXBDb250ZXh0Q3JlYXRlKDAsIHdpZHRoLCBoZWlnaHQsIDgsIHdpZHRoICogNCwgQ0dJbWFn ZUdldENvbG9yU3BhY2UoaW1hZ2UpLCBrQ0dJbWFnZUFscGhhUHJlbXVsdGlwbGllZEZpcnN0IHwg a0NHQml0bWFwQnl0ZU9yZGVyMzJIb3N0KTsKKyAgICBpZiAoIWNvbnRleHQpCisgICAgICAgIHJl dHVybiAwOworICAgIENHQ29udGV4dERyYXdJbWFnZShjb250ZXh0LCBDR1JlY3RNYWtlKDAsIDAs IHdpZHRoLCBoZWlnaHQpLCBpbWFnZSk7CisgICAgQ0dJbWFnZVJlbGVhc2UoaW1hZ2UpOworCisg ICAgQ0dJbWFnZVJlZiBzY2FsZWRJbWFnZSA9IENHQml0bWFwQ29udGV4dENyZWF0ZUltYWdlKGNv bnRleHQpOworICAgIENHQ29udGV4dFJlbGVhc2UoY29udGV4dCk7CisgICAgcmV0dXJuIHNjYWxl ZEltYWdlOworfQorCitEcmFnSW1hZ2VSZWYgZGlzc29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9uKERy YWdJbWFnZVJlZiBpbWFnZSwgZmxvYXQgZGVsdGEpCit7CisgICAgaWYgKCFpbWFnZSkKKyAgICAg ICAgcmV0dXJuIDA7CisgICAgc2l6ZV90IHdpZHRoID0gQ0dJbWFnZUdldFdpZHRoKGltYWdlKTsK KyAgICBzaXplX3QgaGVpZ2h0ID0gQ0dJbWFnZUdldEhlaWdodChpbWFnZSk7CisgICAgQ0dDb250 ZXh0UmVmIGNvbnRleHQgPSBDR0JpdG1hcENvbnRleHRDcmVhdGUoMCwgd2lkdGgsIGhlaWdodCwg OCwgd2lkdGggKiA0LCBDR0ltYWdlR2V0Q29sb3JTcGFjZShpbWFnZSksIGtDR0ltYWdlQWxwaGFQ cmVtdWx0aXBsaWVkRmlyc3QgfCBrQ0dCaXRtYXBCeXRlT3JkZXIzMkhvc3QpOworICAgIGlmICgh Y29udGV4dCkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgLy8gRnJvbSBDR0NvbnRleHQuaDoKKyAg ICAvLyAgICAgVGhlIFBvcnRlci1EdWZmICJzb3VyY2Ugb3ZlciIgbW9kZSBpcyBjYWxsZWQgYGtD R0JsZW5kTW9kZU5vcm1hbCc6CisgICAgLy8gICAgICAgUiA9IFMgKyBEKigxIC0gU2EpCisgICAg Ly8gIFRoaXMgaXMgdGhlIHNhbWUgYXMgTlNDb21wb3NpdGVTb3VyY2VPdmVyLCB3aGljaCBpcyB3 aGF0IC1bTlNJbWFnZSBkaXNzb2x2ZVRvUG9pbnQ6ZnJhY3Rpb246XSB1c2VzLgorICAgIENHQ29u dGV4dFNldEFscGhhKGNvbnRleHQsIGRlbHRhKTsKKyAgICBDR0NvbnRleHRTZXRCbGVuZE1vZGUo Y29udGV4dCwga0NHQmxlbmRNb2RlTm9ybWFsKTsKKyAgICBDR0NvbnRleHREcmF3SW1hZ2UoY29u dGV4dCwgQ0dSZWN0TWFrZSgwLCAwLCB3aWR0aCwgaGVpZ2h0KSwgaW1hZ2UpOworICAgIENHSW1h Z2VSZWxlYXNlKGltYWdlKTsKKworICAgIENHSW1hZ2VSZWYgZGlzc29sdmVkSW1hZ2UgPSBDR0Jp dG1hcENvbnRleHRDcmVhdGVJbWFnZShjb250ZXh0KTsKKyAgICBDR0NvbnRleHRSZWxlYXNlKGNv bnRleHQpOworICAgIHJldHVybiBkaXNzb2x2ZWRJbWFnZTsKK30KKworRHJhZ0ltYWdlUmVmIGNy ZWF0ZURyYWdJbWFnZUZyb21JbWFnZShJbWFnZSogaW1hZ2UpCit7CisgICAgaWYgKCFpbWFnZSkK KyAgICAgICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIENHSW1hZ2VDcmVhdGVDb3B5KGltYWdlLT5u YXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpKTsKIH0KIAogRHJhZ0ltYWdlUmVmIGNyZWF0ZURy YWdJbWFnZUljb25Gb3JDYWNoZWRJbWFnZShDYWNoZWRJbWFnZSopCkluZGV4OiBXZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL0RyYWdJbWFnZVJlZi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlUmVmLmgJKHJldmlzaW9uIDU3MDU0KQorKysgV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VSZWYuaAkod29ya2luZyBjb3B5KQpAQCAtMjks MTMgKzI5LDE2IEBACiAjaWZuZGVmIERyYWdJbWFnZVJlZl9oCiAjZGVmaW5lIERyYWdJbWFnZVJl Zl9oCiAKKyNpZiBPUyhEQVJXSU4pCit0eXBlZGVmIHN0cnVjdCBDR0ltYWdlKiBDR0ltYWdlUmVm OworI2Vsc2UKIGNsYXNzIFNrQml0bWFwOworI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogI2lmIE9TKERBUldJTikKLS8vIEZJWE1FOiBub3QgaW1wbGVtZW50ZWQuCi10eXBlZGVmIHZv aWQqIERyYWdJbWFnZVJlZjsKK3R5cGVkZWYgQ0dJbWFnZVJlZiBEcmFnSW1hZ2VSZWY7CiAjZWxz ZQogdHlwZWRlZiBTa0JpdG1hcCogRHJhZ0ltYWdlUmVmOwogI2VuZGlmCkluZGV4OiBXZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cJKHJldmlzaW9uIDU3MDU0KQorKysgV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEwLTA0LTAzICBOaWNvbGFzIFdlYmVyICA8dGhh a2lzQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVc2UgZHJhZyBpbWFnZXMgb24gT1MgWCBhcyB3ZWxsLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjkKKworICAgICAgICAqIHNy Yy9EcmFnQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRyYWdDbGllbnRJbXBsOjpz dGFydERyYWcpOgorCiAyMDEwLTA0LTAzICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgQWRkIGRlZmF1bHQgaW1wbGVtZW50YXRpb25zIG9mIFdlYk5vdGlmaWNh dGlvblByZXNlbnRlciBtZXRob2RzIHRvCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0RyYWdD bGllbnRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL0RyYWdDbGll bnRJbXBsLmNwcAkocmV2aXNpb24gNTcwNTQpCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0RyYWdD bGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODYsMTcgKzg2LDE0IEBAIHZvaWQgRHJh Z0NsaWVudEltcGw6OnN0YXJ0RHJhZyhEcmFnSW1hZ2UKIAogICAgIEludFNpemUgb2Zmc2V0U2l6 ZShldmVudFBvcyAtIGRyYWdJbWFnZU9yaWdpbik7CiAgICAgV2ViUG9pbnQgb2Zmc2V0UG9pbnQo b2Zmc2V0U2l6ZS53aWR0aCgpLCBvZmZzZXRTaXplLmhlaWdodCgpKTsKLSNpZiBXRUJLSVRfVVNJ TkdfU0tJQQogICAgIG1fd2ViVmlldy0+c3RhcnREcmFnZ2luZygKICAgICAgICAgZHJhZ0RhdGEs IHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb25zTWFzaz4oZHJhZ09wZXJhdGlvbk1hc2spLAot ICAgICAgICBXZWJJbWFnZSgqZHJhZ0ltYWdlKSwgb2Zmc2V0UG9pbnQpOworI2lmIFdFQktJVF9V U0lOR19TS0lBCisgICAgICAgIFdlYkltYWdlKCpkcmFnSW1hZ2UpLAogI2Vsc2UKLSAgICAvLyBG SVhNRTogV2hlbiBEcmFnSW1hZ2VSZWYgaXMgaW1wbGVtZW50ZWQgZm9yIENHLCB3ZSBjYW4gcHJv YmFibHkganVzdCByZW1vdmUKLSAgICAvLyB0aGlzICNpZiBmb3JrLiBGb3Igbm93LCBwYXNzIGFu IGVtcHR5IGltYWdlLgotICAgIG1fd2ViVmlldy0+c3RhcnREcmFnZ2luZygKLSAgICAgICAgZHJh Z0RhdGEsIHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb25zTWFzaz4oZHJhZ09wZXJhdGlvbk1h c2spLAotICAgICAgICBXZWJJbWFnZSgpLCBXZWJQb2ludCgpKTsKKyAgICAgICAgV2ViSW1hZ2Uo KSwKICNlbmRpZgorICAgICAgICBvZmZzZXRQb2ludCk7CiB9CiAKIERyYWdJbWFnZVJlZiBEcmFn Q2xpZW50SW1wbDo6Y3JlYXRlRHJhZ0ltYWdlRm9yTGluayhLVVJMJiwgY29uc3QgU3RyaW5nJiBs YWJlbCwgRnJhbWUqKQo= 52662 2010-04-06 13:33:45 -0700 2010-04-06 18:02:18 -0700 Rebase, now that the dependency has landed. webkit_osxdragimg.diff text/plain 6900 thakis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NzE2MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDQtMDMgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEltcGxlbWVudCBEcmFnSW1hZ2UgZnVuY3Rpb25hbGl0eSBmb3IgY2hyb21pdW0vbWFjLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzcwNjkKKworICAg ICAgICAqIHBhZ2UvY2hyb21pdW0vRHJhZ0NvbnRyb2xsZXJDaHJvbWl1bS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6bWF4RHJhZ0ltYWdlU2l6ZSk6CisgICAgICAgIFVz ZSBhIG1heCBzaXplIG9mIDQwMHg0MDAgb24gT1MgWC4KKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJv bWl1bS9EcmFnSW1hZ2VDaHJvbWl1bU1hYy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpkcmFnSW1h Z2VTaXplKTogSW1wbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6ZGVsZXRlRHJhZ0ltYWdlKTog SW1wbGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6c2NhbGVEcmFnSW1hZ2UpOiBJbXBsZW1lbnQu CisgICAgICAgIChXZWJDb3JlOjpkaXNzb2x2ZURyYWdJbWFnZVRvRnJhY3Rpb24pOiBJbXBsZW1l bnQuCisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVEcmFnSW1hZ2VGcm9tSW1hZ2UpOiBJbXBsZW1l bnQuCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlUmVmLmg6CisgICAgICAg IFVzZSBDR0ltYWdlUmVmcyBhcyBEcmFnSW1hZ2VSZWYgb24gT1MgWC4KKwogMjAxMC0wNC0wNiAg RXZhbiBTdGFkZSAgPGVzdGFkZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViQ29yZS9wYWdlL2Nocm9taXVtL0RyYWdDb250cm9s bGVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9jaHJvbWl1bS9EcmFn Q29udHJvbGxlckNocm9taXVtLmNwcAkocmV2aXNpb24gNTcxNjIpCisrKyBXZWJDb3JlL3BhZ2Uv Y2hyb21pdW0vRHJhZ0NvbnRyb2xsZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY2 LDcgKzY2LDEyIEBAIGJvb2wgRHJhZ0NvbnRyb2xsZXI6OmlzQ29weUtleURvd24oKQogICAgIAog Y29uc3QgSW50U2l6ZSYgRHJhZ0NvbnRyb2xsZXI6Om1heERyYWdJbWFnZVNpemUoKQogeworI2lm IE9TKERBUldJTikKKyAgICAvLyBNYXRjaCBTYWZhcmkncyBkcmFnIGltYWdlIHNpemUuCisgICAg c3RhdGljIGNvbnN0IEludFNpemUgbWF4RHJhZ0ltYWdlU2l6ZSg0MDAsIDQwMCk7CisjZWxzZQog ICAgIHN0YXRpYyBjb25zdCBJbnRTaXplIG1heERyYWdJbWFnZVNpemUoMjAwLCAyMDApOworI2Vu ZGlmCiAgICAgcmV0dXJuIG1heERyYWdJbWFnZVNpemU7CiB9CiAKSW5kZXg6IFdlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlQ2hyb21pdW1NYWMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlQ2hyb21pdW1NYWMuY3BwCShyZXZpc2lv biA1NzE2MikKKysrIFdlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlQ2hyb21pdW1N YWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMSwzNyArMzEsNzEgQEAKICNpbmNsdWRlICJjb25m aWcuaCIKICNpbmNsdWRlICJEcmFnSW1hZ2UuaCIKIAorI2luY2x1ZGUgIkltYWdlLmgiCiAjaW5j bHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKIAorI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0JpdG1h cENvbnRleHQuaD4KKyNpbmNsdWRlIDxDb3JlR3JhcGhpY3MvQ0dJbWFnZS5oPgorCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIEludFNpemUgZHJhZ0ltYWdlU2l6ZShEcmFnSW1hZ2VSZWYgaW1hZ2Up CiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gSW50U2l6ZSgpOworICAgIGlm ICghaW1hZ2UpCisgICAgICAgIHJldHVybiBJbnRTaXplKCk7CisgICAgcmV0dXJuIEludFNpemUo Q0dJbWFnZUdldFdpZHRoKGltYWdlKSwgQ0dJbWFnZUdldEhlaWdodChpbWFnZSkpOwogfQogCiB2 b2lkIGRlbGV0ZURyYWdJbWFnZShEcmFnSW1hZ2VSZWYgaW1hZ2UpCiB7Ci0gICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICBDR0ltYWdlUmVsZWFzZShpbWFnZSk7CiB9CiAKIERyYWdJbWFnZVJlZiBz Y2FsZURyYWdJbWFnZShEcmFnSW1hZ2VSZWYgaW1hZ2UsIEZsb2F0U2l6ZSBzY2FsZSkKIHsKLSAg ICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiAwOwotfQotCi1EcmFnSW1hZ2VSZWYgZGlz c29sdmVEcmFnSW1hZ2VUb0ZyYWN0aW9uKERyYWdJbWFnZVJlZiBpbWFnZSwgZmxvYXQpCi17Ci0g ICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gaW1hZ2U7Ci19Ci0KLURyYWdJbWFnZVJl ZiBjcmVhdGVEcmFnSW1hZ2VGcm9tSW1hZ2UoSW1hZ2UqIGltZykKLXsKLSAgICBub3RJbXBsZW1l bnRlZCgpOwotICAgIHJldHVybiAwOworICAgIGlmICghaW1hZ2UpCisgICAgICAgIHJldHVybiAw OworICAgIHNpemVfdCB3aWR0aCA9IHJvdW5kZihDR0ltYWdlR2V0V2lkdGgoaW1hZ2UpICogc2Nh bGUud2lkdGgoKSk7CisgICAgc2l6ZV90IGhlaWdodCA9IHJvdW5kZihDR0ltYWdlR2V0SGVpZ2h0 KGltYWdlKSAqIHNjYWxlLmhlaWdodCgpKTsKKyAgICBDR0NvbnRleHRSZWYgY29udGV4dCA9IENH Qml0bWFwQ29udGV4dENyZWF0ZSgwLCB3aWR0aCwgaGVpZ2h0LCA4LCB3aWR0aCAqIDQsIENHSW1h Z2VHZXRDb2xvclNwYWNlKGltYWdlKSwga0NHSW1hZ2VBbHBoYVByZW11bHRpcGxpZWRGaXJzdCB8 IGtDR0JpdG1hcEJ5dGVPcmRlcjMySG9zdCk7CisgICAgaWYgKCFjb250ZXh0KQorICAgICAgICBy ZXR1cm4gMDsKKyAgICBDR0NvbnRleHREcmF3SW1hZ2UoY29udGV4dCwgQ0dSZWN0TWFrZSgwLCAw LCB3aWR0aCwgaGVpZ2h0KSwgaW1hZ2UpOworICAgIENHSW1hZ2VSZWxlYXNlKGltYWdlKTsKKwor ICAgIENHSW1hZ2VSZWYgc2NhbGVkSW1hZ2UgPSBDR0JpdG1hcENvbnRleHRDcmVhdGVJbWFnZShj b250ZXh0KTsKKyAgICBDR0NvbnRleHRSZWxlYXNlKGNvbnRleHQpOworICAgIHJldHVybiBzY2Fs ZWRJbWFnZTsKK30KKworRHJhZ0ltYWdlUmVmIGRpc3NvbHZlRHJhZ0ltYWdlVG9GcmFjdGlvbihE cmFnSW1hZ2VSZWYgaW1hZ2UsIGZsb2F0IGRlbHRhKQoreworICAgIGlmICghaW1hZ2UpCisgICAg ICAgIHJldHVybiAwOworICAgIHNpemVfdCB3aWR0aCA9IENHSW1hZ2VHZXRXaWR0aChpbWFnZSk7 CisgICAgc2l6ZV90IGhlaWdodCA9IENHSW1hZ2VHZXRIZWlnaHQoaW1hZ2UpOworICAgIENHQ29u dGV4dFJlZiBjb250ZXh0ID0gQ0dCaXRtYXBDb250ZXh0Q3JlYXRlKDAsIHdpZHRoLCBoZWlnaHQs IDgsIHdpZHRoICogNCwgQ0dJbWFnZUdldENvbG9yU3BhY2UoaW1hZ2UpLCBrQ0dJbWFnZUFscGhh UHJlbXVsdGlwbGllZEZpcnN0IHwga0NHQml0bWFwQnl0ZU9yZGVyMzJIb3N0KTsKKyAgICBpZiAo IWNvbnRleHQpCisgICAgICAgIHJldHVybiAwOworICAgIC8vIEZyb20gQ0dDb250ZXh0Lmg6Cisg ICAgLy8gICAgIFRoZSBQb3J0ZXItRHVmZiAic291cmNlIG92ZXIiIG1vZGUgaXMgY2FsbGVkIGBr Q0dCbGVuZE1vZGVOb3JtYWwnOgorICAgIC8vICAgICAgIFIgPSBTICsgRCooMSAtIFNhKQorICAg IC8vICBUaGlzIGlzIHRoZSBzYW1lIGFzIE5TQ29tcG9zaXRlU291cmNlT3Zlciwgd2hpY2ggaXMg d2hhdCAtW05TSW1hZ2UgZGlzc29sdmVUb1BvaW50OmZyYWN0aW9uOl0gdXNlcy4KKyAgICBDR0Nv bnRleHRTZXRBbHBoYShjb250ZXh0LCBkZWx0YSk7CisgICAgQ0dDb250ZXh0U2V0QmxlbmRNb2Rl KGNvbnRleHQsIGtDR0JsZW5kTW9kZU5vcm1hbCk7CisgICAgQ0dDb250ZXh0RHJhd0ltYWdlKGNv bnRleHQsIENHUmVjdE1ha2UoMCwgMCwgd2lkdGgsIGhlaWdodCksIGltYWdlKTsKKyAgICBDR0lt YWdlUmVsZWFzZShpbWFnZSk7CisKKyAgICBDR0ltYWdlUmVmIGRpc3NvbHZlZEltYWdlID0gQ0dC aXRtYXBDb250ZXh0Q3JlYXRlSW1hZ2UoY29udGV4dCk7CisgICAgQ0dDb250ZXh0UmVsZWFzZShj b250ZXh0KTsKKyAgICByZXR1cm4gZGlzc29sdmVkSW1hZ2U7Cit9CisKK0RyYWdJbWFnZVJlZiBj cmVhdGVEcmFnSW1hZ2VGcm9tSW1hZ2UoSW1hZ2UqIGltYWdlKQoreworICAgIGlmICghaW1hZ2Up CisgICAgICAgIHJldHVybiAwOworICAgIHJldHVybiBDR0ltYWdlQ3JlYXRlQ29weShpbWFnZS0+ bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKSk7CiB9CiAKIERyYWdJbWFnZVJlZiBjcmVhdGVE cmFnSW1hZ2VJY29uRm9yQ2FjaGVkSW1hZ2UoQ2FjaGVkSW1hZ2UqKQpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9EcmFnSW1hZ2VSZWYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL0RyYWdJbWFnZVJlZi5oCShyZXZpc2lvbiA1NzE2MikKKysrIFdlYkNv cmUvcGxhdGZvcm0vY2hyb21pdW0vRHJhZ0ltYWdlUmVmLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5 LDEzICsyOSwxNiBAQAogI2lmbmRlZiBEcmFnSW1hZ2VSZWZfaAogI2RlZmluZSBEcmFnSW1hZ2VS ZWZfaAogCisjaWYgT1MoREFSV0lOKQordHlwZWRlZiBzdHJ1Y3QgQ0dJbWFnZSogQ0dJbWFnZVJl ZjsKKyNlbHNlCiBjbGFzcyBTa0JpdG1hcDsKKyNlbmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKICNpZiBPUyhEQVJXSU4pCi0vLyBGSVhNRTogbm90IGltcGxlbWVudGVkLgotdHlwZWRlZiB2 b2lkKiBEcmFnSW1hZ2VSZWY7Cit0eXBlZGVmIENHSW1hZ2VSZWYgRHJhZ0ltYWdlUmVmOwogI2Vs c2UKIHR5cGVkZWYgU2tCaXRtYXAqIERyYWdJbWFnZVJlZjsKICNlbmRpZgpJbmRleDogV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCShyZXZpc2lvbiA1NzE2MikKKysrIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wNC0wMyAgTmljb2xhcyBXZWJlciAgPHRo YWtpc0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXNlIGRyYWcgaW1hZ2VzIG9uIE9TIFggYXMgd2VsbC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MDY5CisKKyAgICAgICAgKiBz cmMvRHJhZ0NsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpEcmFnQ2xpZW50SW1wbDo6 c3RhcnREcmFnKToKKwogMjAxMC0wNC0wNiAgRXZhbiBTdGFkZSAgPGVzdGFkZUBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9EcmFnQ2xpZW50SW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL3NyYy9EcmFnQ2xpZW50SW1wbC5jcHAJKHJldmlzaW9uIDU3MTYyKQorKysgV2ViS2l0 L2Nocm9taXVtL3NyYy9EcmFnQ2xpZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg2LDE3 ICs4NiwxNCBAQCB2b2lkIERyYWdDbGllbnRJbXBsOjpzdGFydERyYWcoRHJhZ0ltYWdlCiAKICAg ICBJbnRTaXplIG9mZnNldFNpemUoZXZlbnRQb3MgLSBkcmFnSW1hZ2VPcmlnaW4pOwogICAgIFdl YlBvaW50IG9mZnNldFBvaW50KG9mZnNldFNpemUud2lkdGgoKSwgb2Zmc2V0U2l6ZS5oZWlnaHQo KSk7Ci0jaWYgV0VCS0lUX1VTSU5HX1NLSUEKICAgICBtX3dlYlZpZXctPnN0YXJ0RHJhZ2dpbmco CiAgICAgICAgIGRyYWdEYXRhLCBzdGF0aWNfY2FzdDxXZWJEcmFnT3BlcmF0aW9uc01hc2s+KGRy YWdPcGVyYXRpb25NYXNrKSwKLSAgICAgICAgZHJhZ0ltYWdlID8gV2ViSW1hZ2UoKmRyYWdJbWFn ZSkgOiBXZWJJbWFnZSgpLCBvZmZzZXRQb2ludCk7CisjaWYgV0VCS0lUX1VTSU5HX1NLSUEKKyAg ICAgICAgZHJhZ0ltYWdlID8gV2ViSW1hZ2UoKmRyYWdJbWFnZSkgOiBXZWJJbWFnZSgpLAogI2Vs c2UKLSAgICAvLyBGSVhNRTogV2hlbiBEcmFnSW1hZ2VSZWYgaXMgaW1wbGVtZW50ZWQgZm9yIENH LCB3ZSBjYW4gcHJvYmFibHkganVzdCByZW1vdmUKLSAgICAvLyB0aGlzICNpZiBmb3JrLiBGb3Ig bm93LCBwYXNzIGFuIGVtcHR5IGltYWdlLgotICAgIG1fd2ViVmlldy0+c3RhcnREcmFnZ2luZygK LSAgICAgICAgZHJhZ0RhdGEsIHN0YXRpY19jYXN0PFdlYkRyYWdPcGVyYXRpb25zTWFzaz4oZHJh Z09wZXJhdGlvbk1hc2spLAotICAgICAgICBXZWJJbWFnZSgpLCBXZWJQb2ludCgpKTsKKyAgICAg ICAgZHJhZ0ltYWdlID8gV2ViSW1hZ2UoZHJhZ0ltYWdlKSA6IFdlYkltYWdlKCksCiAjZW5kaWYK KyAgICAgICAgb2Zmc2V0UG9pbnQpOwogfQogCiBEcmFnSW1hZ2VSZWYgRHJhZ0NsaWVudEltcGw6 OmNyZWF0ZURyYWdJbWFnZUZvckxpbmsoS1VSTCYsIGNvbnN0IFN0cmluZyYgbGFiZWwsIEZyYW1l KikK