21511 2008-10-09 17:00:47 -0700 Add some PLATFORM(CHROMIUM) ifdefs to WebCore 2008-10-14 22:25:01 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd abarth oldest_to_newest 94807 0 fishd 2008-10-09 17:00:47 -0700 Add some PLATFORM(CHROMIUM) ifdefs to WebCore This will be done in two parts. The first part adds ifdefs to WebCore outside of the platform directory. The second part adds them to platform. 94809 1 24247 fishd 2008-10-09 17:02:35 -0700 Created attachment 24247 part 1 94850 2 fishd 2008-10-09 21:47:59 -0700 I broke the pan scrolling business out into a separate bug. See bug 21515. 94861 3 24257 fishd 2008-10-10 00:07:01 -0700 Created attachment 24257 patch - all but platform/graphics This covers everything except platform/graphics. 94863 4 fishd 2008-10-10 00:16:36 -0700 Summary of changes: loader/FTP* - trivial: should be using WIN_OS instead of WIN loader/FrameLoader.cpp - extending an existing PLATFORM(WIN) ifdef platform/ContextMenuItem.h - Chromium doesn't need anything here, so a default PlatformMenuItemDescription is sufficient. platform/Cursor.h - PlatformCursor is defined in a separate header file. platform/DragData.h - DragDataRef is defined in a separate header file. platform/DragImage.h - DragImageRef is defined in a separate header file. platform/Pasteboard.h - PasteboardPrivate is used to contain all private members for the Chromium port. platform/PlatformKeyboardEvent.h - isSystemKey is shared with PLATFORM(WIN). - private becomes protected to support Chromium's approach to using a subclass of PlatformKeyboardEvent in order to initialize a PlatformKeyboardEvent object. platform/PlatformMenuDescription.h - Chromium doesn't need anything here, so a default PlatformMenuDescription is sufficient. platform/PlatformMouseEvent.h platform/PlatformWheelEvent.h - Same private to protected change as done for PlatformKeyboardEvent platform/PopupMenu.h - PopupMenuPrivate is used to contain all private members for the Chromium port. platform/ScrollView.h - turns out this PLATFORM(WIN) ifdef was unnecessary. platform/Widget.h - PlatformWidget is defined in a separate header file. platform/network/NetworkStateNotifier.h - NetworkStateNotifierPrivate is used to contain all private members for the Chromium port. 94923 5 24257 darin 2008-10-10 14:39:50 -0700 Comment on attachment 24257 patch - all but platform/graphics #elif PLATFORM(WX) typedef wxMenuItem* PlatformMenuItemDescription; +#else + typedef void* PlatformMenuItemDescription; #endif Yuck. Can we do better here? I see that Cursor.h does this already, but I don't understand why that's OK. It seems that just using an untyped pointer is not a great solution. +#elif PLATFORM(CHROMIUM) +#include "PlatformCursor.h" #endif If putting the platform specifics into a separate header file is a better approach, we should be breaking out those cascading #ifs into separate files for all the other platforms too instead of just doing it for Chromium. +#if PLATFORM(CHROMIUM) +#include "PasteboardPrivate.h" +#endif Same comment. It seems that we're settling for improving things for Chromium without making the same improvements for the other platforms, which is OK if we just want to do the minimum. But I think it's not as good for the project as a whole as it would be to make the platforms all work that way. Index: platform/PlatformMouseEvent.h =================================================================== --- platform/PlatformMouseEvent.h (revision 37449) +++ platform/PlatformMouseEvent.h (working copy) @@ -137,7 +137,7 @@ namespace WebCore { #endif - private: + protected: Same comment again. It seems you are advocating a new design here to avoid the per-platform constructors in the header: make data members protected and use a derived class just for construction. But this patch does this new way only for Chromium, and with no comment in the header explaining the somewhat subtle technique. I'd much prefer a patch that does this for all platforms. And also, I think adding a protected inline init function would be better than just making all the data members protected. r=me I'll reluctantly allow that we can do these changes exactly as-is, but I'd like to see an approach where improvements to the cross-platform approach are done in a way that helps everybody, not just one platform. 94931 6 fishd 2008-10-10 15:38:31 -0700 Thank you for being so accommodating. I am very interested in changing all of the ports to match the pattern I'm advocating for Chromium, but I figure that it would best for me to demonstrate the full approach with Chromium first. I plan on filing follow-up bugs for cleaning up the other ports. It is just a bit beyond me at this point to try to move all of the ports to a new system. Incremental seems best at this point. 95143 7 sam 2008-10-12 19:20:50 -0700 It seems odd to me that this patch includes #includes for files that don't exist. I would rather we waited to add those #includes until the files existed. 95268 8 abarth 2008-10-14 01:44:22 -0700 Is this good to land or are we waiting for Sam's previous comment to be addressed? Assigning to Sam for resolution. 95291 9 fishd 2008-10-14 08:17:19 -0700 I spoke with Sam on #webkit. He's cool with the patch as-is. I'm going to land this once I get commit access (which I may already have, but I need to find bdash first). 95379 10 fishd 2008-10-14 22:25:01 -0700 http://trac.webkit.org/changeset/37599 going to punt platform/graphics to another bug. 24247 2008-10-09 17:02:35 -0700 2008-10-09 23:19:20 -0700 part 1 platform_chromium_1.diff text/plain 4396 fishd SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM3NDUy KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDgtMTAt MDkgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc29tZSBQTEFURk9STShDSFJPTUlV TSkgdG8gcGxhY2VzIGluIFdlYkNvcmUvIG91dHNpZGUgb2YgdGhlCisgICAgICAgIHBsYXRmb3Jt IGRpcmVjdG9yeS4KKworICAgICAgICAqIGxvYWRlci9GVFBEaXJlY3RvcnlEb2N1bWVudC5jcHA6 CisgICAgICAgICogbG9hZGVyL0ZUUERpcmVjdG9yeVBhcnNlci5jcHA6CisgICAgICAgICogbG9h ZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpmaW5p c2hlZExvYWRpbmdEb2N1bWVudCk6CisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpoYW5kbGVBdXRvc2Nyb2xsKToKKyAgICAg ICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6YXV0b3Njcm9sbFRpbWVyRmlyZWQpOgorICAgICAg ICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpzdG9wQXV0b3Njcm9sbFRpbWVyKToKKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VQcmVzc0V2ZW50KToKKyAgICAgICAg KFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6a2V5RXZlbnQpOgorCiAyMDA4LTEwLTA5ICBLZXZpbiBP bGxpdmllciAgPGtldmlub0B0aGVvbGxpdmllcnMuY29tPgogCiAgICAgICAgIHd4IGJ1aWxkIGZp eGVzLgpJbmRleDogbG9hZGVyL0ZUUERpcmVjdG9yeURvY3VtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBsb2FkZXIvRlRQRGlyZWN0b3J5RG9jdW1lbnQuY3BwCShyZXZpc2lvbiAzNzQ0OSkKKysrIGxv YWRlci9GVFBEaXJlY3RvcnlEb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNSw3ICsy MzUsNyBAQCBzdGF0aWMgc3RydWN0IHRtICpsb2NhbFRpbWVRdChjb25zdCB0aW1lCiB9CiAKICNk ZWZpbmUgbG9jYWx0aW1lX3IoeCwgeSkgbG9jYWxUaW1lUXQoeCwgeSkKLSNlbGlmIFBMQVRGT1JN KFdJTikgJiYgIWRlZmluZWQobG9jYWx0aW1lX3IpCisjZWxpZiBQTEFURk9STShXSU5fT1MpICYm ICFkZWZpbmVkKGxvY2FsdGltZV9yKQogI2RlZmluZSBsb2NhbHRpbWVfcih4LCB5KSBsb2NhbHRp bWVfcygoeSksICh4KSkKICNlbmRpZgogCkluZGV4OiBsb2FkZXIvRlRQRGlyZWN0b3J5UGFyc2Vy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBsb2FkZXIvRlRQRGlyZWN0b3J5UGFyc2VyLmNwcAkocmV2aXNp b24gMzc0NDkpCisrKyBsb2FkZXIvRlRQRGlyZWN0b3J5UGFyc2VyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNTEsNyArNTEsNyBAQCBzdGF0aWMgc3RydWN0IHRtICpnbXRpbWVRdChjb25zdCB0aW1l X3QgCiB9CiAKICNkZWZpbmUgZ210aW1lX3IoeCwgeSkgZ210aW1lUXQoeCwgeSkKLSNlbGlmIFBM QVRGT1JNKFdJTikgJiYgIWRlZmluZWQoZ210aW1lX3IpCisjZWxpZiBQTEFURk9STShXSU5fT1Mp ICYmICFkZWZpbmVkKGdtdGltZV9yKQogI2RlZmluZSBnbXRpbWVfcih4LCB5KSBnbXRpbWVfcygo eSksICh4KSkKICNlbmRpZgogCkluZGV4OiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIGxvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDM3NDQ5KQorKysgbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAyMiw3ICszMDIyLDggQEAgdm9p ZCBGcmFtZUxvYWRlcjo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZQogCiB2b2lkIEZyYW1lTG9hZGVy OjpmaW5pc2hlZExvYWRpbmdEb2N1bWVudChEb2N1bWVudExvYWRlciogbG9hZGVyKQogewotI2lm IFBMQVRGT1JNKFdJTikKKyAgICAvLyBGSVhNRTogUGxhdGZvcm1zIHNob3VsZG4ndCBkaWZmZXIg aGVyZSEKKyNpZiBQTEFURk9STShXSU4pIHx8IFBMQVRGT1JNKENIUk9NSVVNKQogICAgIGlmICht X2NyZWF0aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQpCiAgICAgICAgIHJldHVybjsKICNlbmRpZgpJ bmRleDogcGFnZS9FdmVudEhhbmRsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBhZ2UvRXZlbnRIYW5k bGVyLmNwcAkocmV2aXNpb24gMzc0NDkpCisrKyBwYWdlL0V2ZW50SGFuZGxlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTU3Niw3ICs1NzYsNyBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6aGFuZGxlQXV0 b3Njcm9sbChSZW5kCiAKICAgICBzZXRBdXRvc2Nyb2xsUmVuZGVyZXIocmVuZGVyZXIpOwogCi0j aWYgUExBVEZPUk0oV0lOKQorI2lmIFBMQVRGT1JNKFdJTikgfHwgUExBVEZPUk0oQ0hST01JVU0p CiAgICAgaWYgKG1fcGFuU2Nyb2xsSW5Qcm9ncmVzcykgewogICAgICAgICBtX3BhblNjcm9sbFN0 YXJ0UG9zID0gY3VycmVudE1vdXNlUG9zaXRpb24oKTsKICAgICAgICAgbV9mcmFtZS0+dmlldygp LT5hZGRQYW5TY3JvbGxJY29uKG1fcGFuU2Nyb2xsU3RhcnRQb3MpOwpAQCAtNjA5LDcgKzYwOSw3 IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjphdXRvc2Nyb2xsVGltZXJGaXJlZCgKICAgICAgICAgICAg IHN0b3BBdXRvc2Nyb2xsVGltZXIoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQot I2lmIFBMQVRGT1JNKFdJTikKKyNpZiBQTEFURk9STShXSU4pIHx8IFBMQVRGT1JNKENIUk9NSVVN KQogICAgICAgICBzZXRQYW5TY3JvbGxDdXJzb3IoKTsKICAgICAgICAgci0+cGFuU2Nyb2xsKG1f cGFuU2Nyb2xsU3RhcnRQb3MpOwogI2VuZGlmCkBAIC03NDQsNyArNzQ0LDcgQEAgdm9pZCBFdmVu dEhhbmRsZXI6OnN0b3BBdXRvc2Nyb2xsVGltZXIoYgogICAgIGlmIChhdXRvc2Nyb2xsUmVuZGVy ZXIoKSkgewogICAgICAgICBpZiAoIXJlbmRlcmVySXNCZWluZ0Rlc3Ryb3llZCAmJiAobV9hdXRv c2Nyb2xsSW5Qcm9ncmVzcyB8fCBtX3BhblNjcm9sbEluUHJvZ3Jlc3MpKQogICAgICAgICAgICAg YXV0b3Njcm9sbFJlbmRlcmVyKCktPnN0b3BBdXRvc2Nyb2xsKCk7Ci0jaWYgUExBVEZPUk0oV0lO KQorI2lmIFBMQVRGT1JNKFdJTikgfHwgUExBVEZPUk0oQ0hST01JVU0pCiAgICAgICAgIGlmICht X3BhblNjcm9sbEluUHJvZ3Jlc3MpIHsKICAgICAgICAgICAgIG1fZnJhbWUtPnZpZXcoKS0+cmVt b3ZlUGFuU2Nyb2xsSWNvbigpOwogICAgICAgICAgICAgbV9mcmFtZS0+dmlldygpLT5zZXRDdXJz b3IocG9pbnRlckN1cnNvcigpKTsKQEAgLTEwMjIsNyArMTAyMiw3IEBAIGJvb2wgRXZlbnRIYW5k bGVyOjpoYW5kbGVNb3VzZVByZXNzRXZlbnQKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQog Ci0jaWYgUExBVEZPUk0oV0lOKQorI2lmIFBMQVRGT1JNKFdJTikgfHwgUExBVEZPUk0oQ0hST01J VU0pCiAgICAgaWYgKG1fZnJhbWUtPnBhZ2UoKS0+bWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigp LT5wYW5TY3JvbGxJblByb2dyZXNzKCkgfHwgbV9hdXRvc2Nyb2xsSW5Qcm9ncmVzcykgewogICAg ICAgICBzdG9wQXV0b3Njcm9sbFRpbWVyKCk7CiAgICAgICAgIGludmFsaWRhdGVDbGljaygpOwpA QCAtMTczNyw3ICsxNzM3LDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6Om5lZWRzS2V5Ym9hcmRFdmVu dERpcwogCiBib29sIEV2ZW50SGFuZGxlcjo6a2V5RXZlbnQoY29uc3QgUGxhdGZvcm1LZXlib2Fy ZEV2ZW50JiBpbml0aWFsS2V5RXZlbnQpCiB7Ci0jaWYgUExBVEZPUk0oV0lOKSB8fCAoUExBVEZP Uk0oV1gpICYmIFBMQVRGT1JNKFdJTl9PUykpCisjaWYgUExBVEZPUk0oV0lOKSB8fCBQTEFURk9S TShDSFJPTUlVTSkgfHwgKFBMQVRGT1JNKFdYKSAmJiBQTEFURk9STShXSU5fT1MpKQogICAgIGlm IChtX2ZyYW1lLT5wYWdlKCktPm1haW5GcmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+cGFuU2Nyb2xs SW5Qcm9ncmVzcygpIHx8IG1fYXV0b3Njcm9sbEluUHJvZ3Jlc3MpIHsKICAgICAgICAgU3RyaW5n IGVzY0tleUlkID0gIlUrMDAxQiI7CiAgICAgICAgIC8vIElmIGEga2V5IGlzIHByZXNzZWQgd2hp bGUgdGhlIGF1dG9zY3JvbGwvcGFuU2Nyb2xsIGlzIGluIHByb2dyZXNzIHRoZW4gd2Ugd2FudCB0 byBzdG9wCg== 24257 2008-10-10 00:07:01 -0700 2008-10-10 14:39:50 -0700 patch - all but platform/graphics platform_chromium_2.diff text/plain 9529 fishd SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM3NDc1 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMDgtMTAt MTAgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc29tZSBQTEFURk9STShDSFJPTUlV TSkgaWZkZWZzIHRvIFdlYkNvcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxNTExCisKKyAgICAgICAgKiBsb2FkZXIvRlRQRGlyZWN0b3J5RG9jdW1l bnQuY3BwOgorICAgICAgICAqIGxvYWRlci9GVFBEaXJlY3RvcnlQYXJzZXIuY3BwOgorICAgICAg ICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6ZmluaXNoZWRMb2FkaW5nRG9jdW1lbnQpOgorICAgICAgICAqIHBsYXRmb3JtL0NvbnRleHRN ZW51SXRlbS5oOgorICAgICAgICAqIHBsYXRmb3JtL0N1cnNvci5oOgorICAgICAgICAqIHBsYXRm b3JtL0RyYWdEYXRhLmg6CisgICAgICAgICogcGxhdGZvcm0vRHJhZ0ltYWdlLmg6CisgICAgICAg ICogcGxhdGZvcm0vUGFzdGVib2FyZC5oOgorICAgICAgICAqIHBsYXRmb3JtL1BsYXRmb3JtS2V5 Ym9hcmRFdmVudC5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1LZXlib2FyZEV2ZW50Ojpp c1N5c3RlbUtleSk6CisgICAgICAgICogcGxhdGZvcm0vUGxhdGZvcm1NZW51RGVzY3JpcHRpb24u aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9QbGF0Zm9ybVdoZWVsRXZlbnQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9Qb3B1cE1l bnUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6CisgICAgICAgICogcGxhdGZv cm0vV2lkZ2V0Lmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVOb3Rp Zmllci5oOgorCiAyMDA4LTEwLTA5ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgc3VwcG9ydCBmb3Igc2Nyb2xsYmFyIG9yaWVudGF0aW9uIGFzIGEgcHNldWRv Y2xhc3MuICBBZGQgc3VwcG9ydCBmb3Igd2hldGhlciBvciBub3QgdGhlIHNjcm9sbGJhcgpJbmRl eDogbG9hZGVyL0ZUUERpcmVjdG9yeURvY3VtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBsb2FkZXIv RlRQRGlyZWN0b3J5RG9jdW1lbnQuY3BwCShyZXZpc2lvbiAzNzQ0OSkKKysrIGxvYWRlci9GVFBE aXJlY3RvcnlEb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNSw3ICsyMzUsNyBAQCBz dGF0aWMgc3RydWN0IHRtICpsb2NhbFRpbWVRdChjb25zdCB0aW1lCiB9CiAKICNkZWZpbmUgbG9j YWx0aW1lX3IoeCwgeSkgbG9jYWxUaW1lUXQoeCwgeSkKLSNlbGlmIFBMQVRGT1JNKFdJTikgJiYg IWRlZmluZWQobG9jYWx0aW1lX3IpCisjZWxpZiBQTEFURk9STShXSU5fT1MpICYmICFkZWZpbmVk KGxvY2FsdGltZV9yKQogI2RlZmluZSBsb2NhbHRpbWVfcih4LCB5KSBsb2NhbHRpbWVfcygoeSks ICh4KSkKICNlbmRpZgogCkluZGV4OiBsb2FkZXIvRlRQRGlyZWN0b3J5UGFyc2VyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBsb2FkZXIvRlRQRGlyZWN0b3J5UGFyc2VyLmNwcAkocmV2aXNpb24gMzc0NDkp CisrKyBsb2FkZXIvRlRQRGlyZWN0b3J5UGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEs NyArNTEsNyBAQCBzdGF0aWMgc3RydWN0IHRtICpnbXRpbWVRdChjb25zdCB0aW1lX3QgCiB9CiAK ICNkZWZpbmUgZ210aW1lX3IoeCwgeSkgZ210aW1lUXQoeCwgeSkKLSNlbGlmIFBMQVRGT1JNKFdJ TikgJiYgIWRlZmluZWQoZ210aW1lX3IpCisjZWxpZiBQTEFURk9STShXSU5fT1MpICYmICFkZWZp bmVkKGdtdGltZV9yKQogI2RlZmluZSBnbXRpbWVfcih4LCB5KSBnbXRpbWVfcygoeSksICh4KSkK ICNlbmRpZgogCkluZGV4OiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxv YWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDM3NDQ5KQorKysgbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAyMiw3ICszMDIyLDggQEAgdm9pZCBGcmFtZUxv YWRlcjo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZQogCiB2b2lkIEZyYW1lTG9hZGVyOjpmaW5pc2hl ZExvYWRpbmdEb2N1bWVudChEb2N1bWVudExvYWRlciogbG9hZGVyKQogewotI2lmIFBMQVRGT1JN KFdJTikKKyAgICAvLyBGSVhNRTogUGxhdGZvcm1zIHNob3VsZG4ndCBkaWZmZXIgaGVyZSEKKyNp ZiBQTEFURk9STShXSU4pIHx8IFBMQVRGT1JNKENIUk9NSVVNKQogICAgIGlmIChtX2NyZWF0aW5n SW5pdGlhbEVtcHR5RG9jdW1lbnQpCiAgICAgICAgIHJldHVybjsKICNlbmRpZgpJbmRleDogcGxh dGZvcm0vQ29udGV4dE1lbnVJdGVtLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vQ29udGV4dE1l bnVJdGVtLmgJKHJldmlzaW9uIDM3NDQ5KQorKysgcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmgJ KHdvcmtpbmcgY29weSkKQEAgLTE2OSw2ICsxNjksOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAg ICAgfTsKICNlbGlmIFBMQVRGT1JNKFdYKQogICAgIHR5cGVkZWYgd3hNZW51SXRlbSogUGxhdGZv cm1NZW51SXRlbURlc2NyaXB0aW9uOworI2Vsc2UKKyAgICB0eXBlZGVmIHZvaWQqIFBsYXRmb3Jt TWVudUl0ZW1EZXNjcmlwdGlvbjsKICNlbmRpZgogCiAgICAgY2xhc3MgQ29udGV4dE1lbnVJdGVt IHsKSW5kZXg6IHBsYXRmb3JtL0N1cnNvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRmb3JtL0N1cnNv ci5oCShyZXZpc2lvbiAzNzQ0OSkKKysrIHBsYXRmb3JtL0N1cnNvci5oCSh3b3JraW5nIGNvcHkp CkBAIC0zOCw2ICszOCw4IEBAIHR5cGVkZWYgSElDT04gSENVUlNPUjsKIHR5cGVkZWYgc3RydWN0 IF9HZGtDdXJzb3IgR2RrQ3Vyc29yOwogI2VsaWYgUExBVEZPUk0oUVQpCiAjaW5jbHVkZSA8UUN1 cnNvcj4KKyNlbGlmIFBMQVRGT1JNKENIUk9NSVVNKQorI2luY2x1ZGUgIlBsYXRmb3JtQ3Vyc29y LmgiCiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQykKQEAgLTc2LDYgKzc4LDggQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgIHR5cGVkZWYgUUN1cnNvciBQbGF0Zm9ybUN1cnNvcjsKICNlbGlm IFBMQVRGT1JNKFdYKQogICAgIHR5cGVkZWYgd3hDdXJzb3IqIFBsYXRmb3JtQ3Vyc29yOworI2Vs aWYgUExBVEZPUk0oQ0hST01JVU0pCisgICAgLy8gU2VlIFBsYXRmb3JtQ3Vyc29yLmgKICNlbHNl CiAgICAgdHlwZWRlZiB2b2lkKiBQbGF0Zm9ybUN1cnNvcjsKICNlbmRpZgpJbmRleDogcGxhdGZv cm0vRHJhZ0RhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9EcmFnRGF0YS5oCShyZXZpc2lv biAzNzQ0OSkKKysrIHBsYXRmb3JtL0RyYWdEYXRhLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDYg KzU0LDggQEAgdHlwZWRlZiBjbGFzcyB3eERhdGFPYmplY3QqIERyYWdEYXRhUmVmOwogI2VsaWYg UExBVEZPUk0oR1RLKQogLy8gRklYTUU6IHRoaXMgc2hvdWxkIHByb2JhYmx5IGJlIHNvbWV0aGlu ZyBnZGstc3BlY2lmaWMKIHR5cGVkZWYgdm9pZCogRHJhZ0RhdGFSZWY7CisjZWxpZiBQTEFURk9S TShDSFJPTUlVTSkKKyNpbmNsdWRlICJEcmFnRGF0YVJlZi5oIgogI2VuZGlmCiAKIApJbmRleDog cGxhdGZvcm0vRHJhZ0ltYWdlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vRHJhZ0ltYWdlLmgJ KHJldmlzaW9uIDM3NDQ5KQorKysgcGxhdGZvcm0vRHJhZ0ltYWdlLmgJKHdvcmtpbmcgY29weSkK QEAgLTQ0LDYgKzQ0LDggQEAgUVRfRU5EX05BTUVTUEFDRQogdHlwZWRlZiBzdHJ1Y3QgSEJJVE1B UF9fKiBIQklUTUFQOwogI2VsaWYgUExBVEZPUk0oV1gpCiBjbGFzcyB3eERyYWdJbWFnZTsKKyNl bGlmIFBMQVRGT1JNKENIUk9NSVVNKQorI2luY2x1ZGUgIkRyYWdJbWFnZVJlZi5oIgogI2VuZGlm CiAKIC8vV2UgbmVlZCB0byAjZGVmaW5lIFlPZmZzZXQgYXMgaXQgbmVlZHMgdG8gYmUgc2hhcmVk IHdpdGggV2ViS2l0CkluZGV4OiBwbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g cGxhdGZvcm0vUGFzdGVib2FyZC5oCShyZXZpc2lvbiAzNzQ0OSkKKysrIHBsYXRmb3JtL1Bhc3Rl Ym9hcmQuaAkod29ya2luZyBjb3B5KQpAQCAtNTMsNiArNTMsMTAgQEAgY2xhc3MgTlNBcnJheTsK IHR5cGVkZWYgc3RydWN0IEhXTkRfXyogSFdORDsKICNlbmRpZgogCisjaWYgUExBVEZPUk0oQ0hS T01JVU0pCisjaW5jbHVkZSAiUGFzdGVib2FyZFByaXZhdGUuaCIKKyNlbmRpZgorCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKICNpZiBQTEFURk9STShNQUMpCkBAIC0xMjAsNiArMTI0LDEwIEBAIHBy aXZhdGU6CiAjaWYgUExBVEZPUk0oUVQpCiAgICAgYm9vbCBtX3NlbGVjdGlvbk1vZGU7CiAjZW5k aWYKKworI2lmIFBMQVRGT1JNKENIUk9NSVVNKQorICAgIFBhc3RlYm9hcmRQcml2YXRlIHA7Cisj ZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IHBsYXRmb3JtL1BsYXRm b3JtS2V5Ym9hcmRFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRmb3JtL1BsYXRmb3JtS2V5Ym9h cmRFdmVudC5oCShyZXZpc2lvbiAzNzQ0OSkKKysrIHBsYXRmb3JtL1BsYXRmb3JtS2V5Ym9hcmRF dmVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzIsNyArMTMyLDYgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogCiAjaWYgUExBVEZPUk0oV0lOKQogICAgICAgICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQo SFdORCwgV1BBUkFNLCBMUEFSQU0sIFR5cGUsIGJvb2wpOwotICAgICAgICBib29sIGlzU3lzdGVt S2V5KCkgY29uc3QgeyByZXR1cm4gbV9pc1N5c3RlbUtleTsgfQogI2VuZGlmCiAKICNpZiBQTEFU Rk9STShHVEspCkBAIC0xNDksNyArMTQ4LDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgUGxhdGZvcm1LZXlib2FyZEV2ZW50KHd4S2V5RXZlbnQmKTsKICNlbmRpZgogCi0gICAgcHJp dmF0ZToKKyNpZiBQTEFURk9STShXSU4pIHx8IFBMQVRGT1JNKENIUk9NSVVNKQorICAgICAgICBi b29sIGlzU3lzdGVtS2V5KCkgY29uc3QgeyByZXR1cm4gbV9pc1N5c3RlbUtleTsgfQorI2VuZGlm CisKKyAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIFR5cGUgbV90eXBlOwogICAgICAgICBTdHJpbmcg bV90ZXh0OwogICAgICAgICBTdHJpbmcgbV91bm1vZGlmaWVkVGV4dDsKQEAgLTE2Niw3ICsxNjks NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjaWYgUExBVEZPUk0oTUFDKQogICAgICAgICBSZXRh aW5QdHI8TlNFdmVudD4gbV9tYWNFdmVudDsKICNlbmRpZgotI2lmIFBMQVRGT1JNKFdJTikKKyNp ZiBQTEFURk9STShXSU4pIHx8IFBMQVRGT1JNKENIUk9NSVVNKQogICAgICAgICBib29sIG1faXNT eXN0ZW1LZXk7CiAjZW5kaWYKICNpZiBQTEFURk9STShHVEspCkluZGV4OiBwbGF0Zm9ybS9QbGF0 Zm9ybU1lbnVEZXNjcmlwdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBsYXRmb3JtL1BsYXRmb3JtTWVu dURlc2NyaXB0aW9uLmgJKHJldmlzaW9uIDM3NDQ5KQorKysgcGxhdGZvcm0vUGxhdGZvcm1NZW51 RGVzY3JpcHRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNiArNTUsOCBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgdHlwZWRlZiBHdGtNZW51KiBQbGF0Zm9ybU1lbnVEZXNjcmlwdGlvbjsK ICNlbGlmIFBMQVRGT1JNKFdYKQogICAgIHR5cGVkZWYgd3hNZW51KiBQbGF0Zm9ybU1lbnVEZXNj cmlwdGlvbjsKKyNlbHNlCisgICAgdHlwZWRlZiB2b2lkKiBQbGF0Zm9ybU1lbnVEZXNjcmlwdGlv bjsKICNlbmRpZgogCiB9IC8vIG5hbWVzcGFjZQpJbmRleDogcGxhdGZvcm0vUGxhdGZvcm1Nb3Vz ZUV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vUGxhdGZvcm1Nb3VzZUV2ZW50LmgJKHJl dmlzaW9uIDM3NDQ5KQorKysgcGxhdGZvcm0vUGxhdGZvcm1Nb3VzZUV2ZW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTEzNyw3ICsxMzcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAjZW5kaWYKIAog Ci0gICAgcHJpdmF0ZToKKyAgICBwcm90ZWN0ZWQ6CiAgICAgICAgIEludFBvaW50IG1fcG9zaXRp b247CiAgICAgICAgIEludFBvaW50IG1fZ2xvYmFsUG9zaXRpb247CiAgICAgICAgIE1vdXNlQnV0 dG9uIG1fYnV0dG9uOwpJbmRleDogcGxhdGZvcm0vUGxhdGZvcm1XaGVlbEV2ZW50LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gcGxhdGZvcm0vUGxhdGZvcm1XaGVlbEV2ZW50LmgJKHJldmlzaW9uIDM3NDQ5KQor KysgcGxhdGZvcm0vUGxhdGZvcm1XaGVlbEV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTExNiw3 ICsxMTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFBsYXRmb3JtV2hlZWxFdmVu dChjb25zdCB3eE1vdXNlRXZlbnQmLCBjb25zdCB3eFBvaW50Jik7CiAjZW5kaWYKIAotICAgIHBy aXZhdGU6CisgICAgcHJvdGVjdGVkOgogI2lmICFQTEFURk9STShXSU4pCiAgICAgICAgIGludCBo b3Jpem9udGFsTGluZU11bHRpcGxpZXIoKSBjb25zdCB7IHJldHVybiBjTGluZU11bHRpcGxpZXI7 IH0KICAgICAgICAgaW50IHZlcnRpY2FsTGluZU11bHRpcGxpZXIoKSBjb25zdCB7IHJldHVybiBj TGluZU11bHRpcGxpZXI7IH0KSW5kZXg6IHBsYXRmb3JtL1BvcHVwTWVudS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIHBsYXRmb3JtL1BvcHVwTWVudS5oCShyZXZpc2lvbiAzNzQ0OSkKKysrIHBsYXRmb3JtL1Bv cHVwTWVudS5oCSh3b3JraW5nIGNvcHkpCkBAIC01Nyw2ICs1Nyw4IEBAIHR5cGVkZWYgc3RydWN0 IF9HdGtXaWRnZXQgR3RrV2lkZ2V0OwogY2xhc3Mgd3hNZW51OwogI2luY2x1ZGUgPHd4L2RlZnMu aD4KICNpbmNsdWRlIDx3eC9ldmVudC5oPgorI2VsaWYgUExBVEZPUk0oQ0hST01JVU0pCisjaW5j bHVkZSAiUG9wdXBNZW51UHJpdmF0ZS5oIgogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK QEAgLTE3Miw2ICsxNzQsOCBAQCBwcml2YXRlOgogI2VsaWYgUExBVEZPUk0oV1gpCiAgICAgd3hN ZW51KiBtX21lbnU7CiAgICAgdm9pZCBPbk1lbnVJdGVtU2VsZWN0ZWQod3hDb21tYW5kRXZlbnQm KTsKKyNlbGlmIFBMQVRGT1JNKENIUk9NSVVNKQorICAgIFBvcHVwTWVudVByaXZhdGUgcDsKICNl bmRpZgogCiB9OwpJbmRleDogcGxhdGZvcm0vU2Nyb2xsVmlldy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHBs YXRmb3JtL1Njcm9sbFZpZXcuaAkocmV2aXNpb24gMzc0NDkpCisrKyBwbGF0Zm9ybS9TY3JvbGxW aWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDEwICs0Miw2IEBACiB0eXBlZGVmIHN0cnVjdCBf R3RrQWRqdXN0bWVudCBHdGtBZGp1c3RtZW50OwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShXSU4p Ci10eXBlZGVmIHN0cnVjdCBIUkdOX18qIEhSR047Ci0jZW5kaWYKLQogI2lmIFBMQVRGT1JNKFdY KQogY2xhc3Mgd3hTY3JvbGxXaW5FdmVudDsKICNlbmRpZgpJbmRleDogcGxhdGZvcm0vV2lkZ2V0 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vV2lkZ2V0LmgJKHJldmlzaW9uIDM3NDQ5KQorKysg cGxhdGZvcm0vV2lkZ2V0LmgJKHdvcmtpbmcgY29weSkKQEAgLTY1LDYgKzY1LDEwIEBAIGNsYXNz IHd4V2luZG93OwogdHlwZWRlZiB3eFdpbmRvdyogUGxhdGZvcm1XaWRnZXQ7CiAjZW5kaWYKIAor I2lmIFBMQVRGT1JNKENIUk9NSVVNKQorI2luY2x1ZGUgIlBsYXRmb3JtV2lkZ2V0LmgiCisjZW5k aWYKKwogI2luY2x1ZGUgIkludFBvaW50LmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1 ZGUgIkludFNpemUuaCIKSW5kZXg6IHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRlTm90aWZp ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBwbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdGF0ZU5vdGlmaWVy LmgJKHJldmlzaW9uIDM3NDQ5KQorKysgcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVOb3Rp Zmllci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw5IEBACiAKIHR5cGVkZWYgY29uc3Qg c3RydWN0IF9fQ0ZBcnJheSAqIENGQXJyYXlSZWY7CiB0eXBlZGVmIGNvbnN0IHN0cnVjdCBfX1ND RHluYW1pY1N0b3JlICogU0NEeW5hbWljU3RvcmVSZWY7CisKKyNlbGlmIFBMQVRGT1JNKENIUk9N SVVNKQorI2luY2x1ZGUgIk5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZS5oIgogI2VuZGlmCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTY1LDEwICs2OCwxMyBAQCBwcml2YXRlOiAgICAKICAg ICB2b2lkIHJlZ2lzdGVyRm9yQWRkcmVzc0NoYW5nZSgpOwogICAgIEhBTkRMRSBtX3dhaXRIYW5k bGU7CiAgICAgT1ZFUkxBUFBFRCBtX292ZXJsYXBwZWQ7CisKKyNlbGlmIFBMQVRGT1JNKENIUk9N SVVNKQorICAgIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSBwOwogI2VuZGlmCiB9OwogCi0j aWYgIVBMQVRGT1JNKE1BQykgJiYgIVBMQVRGT1JNKFdJTikKKyNpZiAhUExBVEZPUk0oTUFDKSAm JiAhUExBVEZPUk0oV0lOKSAmJiAhUExBVEZPUk0oQ0hST01JVU0pCiBpbmxpbmUgTmV0d29ya1N0 YXRlTm90aWZpZXI6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyKCkKICAgICA6IG1faXNPbkxpbmUodHJ1 ZSkKIHsgICAgCg==