75288 2011-12-27 19:27:36 -0800 [chromium] Prevent crashing due to NULL texture updater. 2012-01-03 19:39:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 74477 1 epenner epenner cc-bugs enne jamesr webkit.review.bot oldest_to_newest 527533 0 epenner 2011-12-27 19:27:36 -0800 [chromium] Prevent crashing due to NULL texture updater. 527534 1 120628 epenner 2011-12-27 19:28:18 -0800 Created attachment 120628 Patch 527537 2 epenner 2011-12-27 19:39:54 -0800 I believe this is a knock-on from: https://bugs.webkit.org/show_bug.cgi?id=74477 Actually, just now I looked at the comments and it looks like this code (in a different place) was in the first patch, but then it got removed in the second patch. Anyway, I believe this is the cause for crashing in TiledLayerChromium::createTile on canary. 527716 3 epenner 2011-12-28 11:26:11 -0800 Hmm, on second thought. This doesn't address the ImageLayerChromium case when the texture updater is accessed earlier... Perhaps we should get rid of the cleanupResources method and use setLayerTreeHost(NULL) to accomplish this? 528637 4 120628 jamesr 2012-01-02 19:37:05 -0800 Comment on attachment 120628 Patch clearing review flag since it seems this isn't the right fix 528869 5 120962 epenner 2012-01-03 11:09:23 -0800 Created attachment 120962 Patch 528875 6 epenner 2012-01-03 11:13:29 -0800 Updated so it fixes the crash in all possible cases. There might be a better way to do this but maybe we can create a separate bug for that cleanup? On a related note, I got OSX building yesterday so I will take a look at why we are so low on memory there. It seems like there is two issues there. 528881 7 jamesr 2012-01-03 11:15:37 -0800 When is this happening? The current code creates a textureUpdater whenever the CCLayerTreeHost pointer is set to something non-null. How are we getting to createTile() with a null updater? Can you make a test? 528900 8 epenner 2012-01-03 11:26:02 -0800 Updated so it fixes the crash in all possible cases. There might be a better way to do this but maybe we can create a separate bug for that cleanup? On a related note, I got OSX building yesterday so I will take a look at why we are so low on memory there. It seems like there is two issues there. (In reply to comment #7) > When is this happening? The current code creates a textureUpdater whenever the CCLayerTreeHost pointer is set to something non-null. How are we getting to createTile() with a null updater? > > Can you make a test? TiledLayerChromium::prepareToUpdateTiles calls cleanupResources when it runs out of memory, which clears the texture updater. Hmm, I think I can modify an existing test to exercise this condition. Will have that in a sec. 528925 9 epenner 2012-01-03 11:51:34 -0800 Actually I can't find a place to test this. Similar tests are in TiledLayerChromiumTest, but this fix relies on derived classes, so a test there would be contrived. Hmm.. 528939 10 epenner 2012-01-03 12:06:48 -0800 As another possible option. I'm not sure we really need to call cleanupResources when a TiledLayerChromium runs out of memory. As the user scrolls, a big layer can thrash between failing and succeeding (as it straddles different numbers of tiles), resulting in latter small layers flickering in and out as they fit into the sporadic free memory. I'd rather just accept we can't render the page and avoid the flickering and thrashing. 529018 11 enne 2012-01-03 13:52:22 -0800 (In reply to comment #8) > TiledLayerChromium::prepareToUpdateTiles calls cleanupResources when it runs out of memory, which clears the texture updater. Hmm, I think I can modify an existing test to exercise this condition. Will have that in a sec. I don't really understand why the texture updater needs to be cleared in cleanupResources. Can we just remove ContentLayerChromium::cleanupResources and ImageLayerChromium::cleanupResources()? 529069 12 120998 epenner 2012-01-03 14:27:54 -0800 Created attachment 120998 Patch 529095 13 120998 jamesr 2012-01-03 15:20:12 -0800 Comment on attachment 120998 Patch Seems OK 529214 14 120998 webkit.review.bot 2012-01-03 17:52:45 -0800 Comment on attachment 120998 Patch Rejecting attachment 120998 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ng file Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h Hunk #1 FAILED at 56. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/platform/graphics/chromium/ContentLayerChromium.h.rej patching file Source/WebCore/platform/graphics/chromium/ImageLayerChromium.cpp patching file Source/WebCore/platform/graphics/chromium/ImageLayerChromium.h Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'James Robinson', u'--f..." exit_code: 1 Full output: http://queues.webkit.org/results/10954686 529240 15 121035 epenner 2012-01-03 18:46:08 -0800 Created attachment 121035 rebase 529260 16 121035 webkit.review.bot 2012-01-03 19:39:27 -0800 Comment on attachment 121035 rebase Clearing flags on attachment: 121035 Committed r104003: <http://trac.webkit.org/changeset/104003> 529261 17 webkit.review.bot 2012-01-03 19:39:31 -0800 All reviewed patches have been landed. Closing bug. 120628 2011-12-27 19:28:18 -0800 2012-01-03 11:09:21 -0800 Patch bug-75288-20111227192817.patch text/plain 1416 epenner U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRlZTlmYzU2ZGFiODY0 NjllN2M4YjQ4MDZjZmIyY2E0NzY1ZTI0NS4uZGRlMjgxOGE3OWQ2MTc5NGY4NmQ2YzA5YTkyMmI0 MDA4MzZiYzdkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTEyLTI3ICBFcmlj IFBlbm5lciAgPGVwZW5uZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIFByZXZl bnQgY3Jhc2hpbmcgZHVlIHRvIE5VTEwgdGV4dHVyZSB1cGRhdGVyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUyODgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUaWxlZExheWVy Q2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZSk6CisKIDIwMTEtMTItMjYgIFZzZXZvbG9kIFZsYXNv diAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ3JlYXRl IHRhYmJlZCBlZGl0b3IgZm9yIHNjcmlwdHMgcGFuZWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0uY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9t aXVtLmNwcAppbmRleCAzMjk5MzIyOTBlN2E4MGU1ZDg0OTAxOThkMWMxZTgxOWE4ODIyMGEyLi44 ZDRhZDBiNTU0ZjNmZjg3M2Q0NTUyMDBlMzgwMmRhYWJiMTRkMDg3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVk TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTQ0MSw2ICs0NDEsMTIgQEAgdm9pZCBUaWxlZExheWVyQ2hy b21pdW06OnByZXBhcmVUb1VwZGF0ZShjb25zdCBJbnRSZWN0JiBjb250ZW50UmVjdCkKICAgICAg ICAgY3JlYXRlVGlsZXIoYm9yZGVyVGV4ZWxPcHRpb24pOwogICAgIH0KIAorICAgIGlmICghbGF5 ZXJUcmVlSG9zdCgpKQorICAgICAgICBDUkFTSCgpOworCisgICAgaWYgKCF0ZXh0dXJlVXBkYXRl cigpKQorICAgICAgICBjcmVhdGVUZXh0dXJlVXBkYXRlcihsYXllclRyZWVIb3N0KCkpOworCiAg ICAgQVNTRVJUKG1fdGlsZXIpOwogCiAgICAgbV9za2lwc0RyYXcgPSBmYWxzZTsK 120962 2012-01-03 11:09:23 -0800 2012-01-03 14:27:51 -0800 Patch bug-75288-20120103110922.patch text/plain 2987 epenner U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRlZTlmYzU2ZGFiODY0 NjllN2M4YjQ4MDZjZmIyY2E0NzY1ZTI0NS4uYmI2MzNjYThhYzUzZGJlZTdkMGQ2MTc3MTliMGU5 ZjE1MTI4YWEyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAxLTAzICBFcmlj IFBlbm5lciAgPGVwZW5uZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIFByZXZl bnQgY3Jhc2hpbmcgZHVlIHRvIE5VTEwgdGV4dHVyZSB1cGRhdGVyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUyODgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRM YXllckNocm9taXVtOjpwYWludENvbnRlbnRzSWZEaXJ0eSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkltYWdlTGF5ZXJDaHJvbWl1bTo6cGFpbnRDb250ZW50c0lmRGlydHkpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpUaWxlZExheWVyQ2hyb21pdW06OnByZXBhcmVUb1VwZGF0ZSk6CisKIDIw MTEtMTItMjYgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogQ3JlYXRlIHRhYmJlZCBlZGl0b3IgZm9yIHNjcmlwdHMgcGFuZWwu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D b250ZW50TGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggYzYzOTU2MzZkNGMzNzMy MTg2YjBjZWVlMTZhMzEyMTk3ZDBjOTZhMC4uY2YzMGU4ZjdhZWI2ZThkYzRhODIyMTJiNTI3NWMx M2ViNDM4YzRmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcApAQCAtOTUs NiArOTUsOSBAQCB2b2lkIENvbnRlbnRMYXllckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzKCkK IAogdm9pZCBDb250ZW50TGF5ZXJDaHJvbWl1bTo6cGFpbnRDb250ZW50c0lmRGlydHkoKQogewor ICAgIGlmICghdGV4dHVyZVVwZGF0ZXIoKSkKKyAgICAgICAgY3JlYXRlVGV4dHVyZVVwZGF0ZXIo bGF5ZXJUcmVlSG9zdCgpKTsKKwogICAgIHVwZGF0ZVRpbGVTaXplQW5kVGlsaW5nT3B0aW9uKCk7 CiAKICAgICBJbnRSZWN0IGxheWVyUmVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3Bw CmluZGV4IDZlZWRjY2U3MTQzODZmMGM1OWZiYWU4MjA1ZjljZmYzMThkZmY1MWYuLjNhYTIyYzU0 NjIwODc1ZWQxM2RlNTBkZjlkOTlkZTIxNTAyYTAyMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNo cm9taXVtLmNwcApAQCAtMTY2LDYgKzE2Niw5IEBAIHZvaWQgSW1hZ2VMYXllckNocm9taXVtOjpz ZXRDb250ZW50cyhJbWFnZSogY29udGVudHMpCiAKIHZvaWQgSW1hZ2VMYXllckNocm9taXVtOjpw YWludENvbnRlbnRzSWZEaXJ0eSgpCiB7CisgICAgaWYgKCF0ZXh0dXJlVXBkYXRlcigpKQorICAg ICAgICBjcmVhdGVUZXh0dXJlVXBkYXRlcihsYXllclRyZWVIb3N0KCkpOworCiAgICAgaWYgKG1f bmVlZHNEaXNwbGF5KSB7CiAgICAgICAgIG1fdGV4dHVyZVVwZGF0ZXItPnVwZGF0ZUZyb21JbWFn ZShtX2NvbnRlbnRzLT5uYXRpdmVJbWFnZUZvckN1cnJlbnRGcmFtZSgpKTsKICAgICAgICAgdXBk YXRlVGlsZVNpemVBbmRUaWxpbmdPcHRpb24oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hyb21pdW0u Y3BwCmluZGV4IDMyOTkzMjI5MGU3YTgwZTVkODQ5MDE5OGQxYzFlODE5YTg4MjIwYTIuLjQ0Y2I4 NDExYTM5NDkyZWMxYjY1NTk3YjhhNGQ0ZTU2NjgxODgyN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJDaHJvbWl1bS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVGlsZWRMYXll ckNocm9taXVtLmNwcApAQCAtNDQxLDYgKzQ0MSw5IEBAIHZvaWQgVGlsZWRMYXllckNocm9taXVt OjpwcmVwYXJlVG9VcGRhdGUoY29uc3QgSW50UmVjdCYgY29udGVudFJlY3QpCiAgICAgICAgIGNy ZWF0ZVRpbGVyKGJvcmRlclRleGVsT3B0aW9uKTsKICAgICB9CiAKKyAgICBpZiAoIXRleHR1cmVV cGRhdGVyKCkpCisgICAgICAgIENSQVNIKCk7CisKICAgICBBU1NFUlQobV90aWxlcik7CiAKICAg ICBtX3NraXBzRHJhdyA9IGZhbHNlOwo= 120998 2012-01-03 14:27:54 -0800 2012-01-03 18:46:00 -0800 Patch bug-75288-20120103142753.patch text/plain 3563 epenner U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRlZTlmYzU2ZGFiODY0 NjllN2M4YjQ4MDZjZmIyY2E0NzY1ZTI0NS4uNDJjYWY1Yzg2MGQ3MzI4ZjRjOWY1ZmM5NzM0NTM1 ZjIzNzkyN2MxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTAzICBFcmlj IFBlbm5lciAgPGVwZW5uZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIFByZXZl bnQgY3Jhc2hpbmcgZHVlIHRvIE5VTEwgdGV4dHVyZSB1cGRhdGVyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUyODgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmg6CisKIDIwMTEtMTItMjYg IFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIElu c3BlY3RvcjogQ3JlYXRlIHRhYmJlZCBlZGl0b3IgZm9yIHNjcmlwdHMgcGFuZWwuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50TGF5 ZXJDaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKaW5kZXggYzYzOTU2MzZkNGMzNzMyMTg2YjBjZWVl MTZhMzEyMTk3ZDBjOTZhMC4uMDViNmQ5ZmNmOTk5YmM5YjJmY2ZjOWViOTMxYzU0MzhlZTdjYTUy NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Q29udGVudExheWVyQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcApAQCAtODcsMTIgKzg3LDYg QEAgQ29udGVudExheWVyQ2hyb21pdW06On5Db250ZW50TGF5ZXJDaHJvbWl1bSgpCiB7CiB9CiAK LXZvaWQgQ29udGVudExheWVyQ2hyb21pdW06OmNsZWFudXBSZXNvdXJjZXMoKQotewotICAgIG1f dGV4dHVyZVVwZGF0ZXIuY2xlYXIoKTsKLSAgICBUaWxlZExheWVyQ2hyb21pdW06OmNsZWFudXBS ZXNvdXJjZXMoKTsKLX0KLQogdm9pZCBDb250ZW50TGF5ZXJDaHJvbWl1bTo6cGFpbnRDb250ZW50 c0lmRGlydHkoKQogewogICAgIHVwZGF0ZVRpbGVTaXplQW5kVGlsaW5nT3B0aW9uKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Db250ZW50 TGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vQ29udGVudExheWVyQ2hyb21pdW0uaAppbmRleCAwYzU3NGI1ZGZkYzBhNTcxYjgxMWJlMDM5 NzY0YWM3NWIxYzJlM2VlLi43ZjJhYTAyOGZmNzNjODllOGQzMTEzNjlkOTY0Nzg0MjcyYjQxYWE1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D b250ZW50TGF5ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0NvbnRlbnRMYXllckNocm9taXVtLmgKQEAgLTU2LDcgKzU2LDYgQEAgcHJv dGVjdGVkOgogICAgIGV4cGxpY2l0IENvbnRlbnRMYXllckNocm9taXVtKENDTGF5ZXJEZWxlZ2F0 ZSopOwogCiBwcml2YXRlOgotICAgIHZpcnR1YWwgdm9pZCBjbGVhbnVwUmVzb3VyY2VzKCk7CiAg ICAgdmlydHVhbCBib29sIGRyYXdzQ29udGVudCgpIGNvbnN0OwogICAgIHZpcnR1YWwgdm9pZCBj cmVhdGVUZXh0dXJlVXBkYXRlcihjb25zdCBDQ0xheWVyVHJlZUhvc3QqKTsKICAgICB2aXJ0dWFs IExheWVyVGV4dHVyZVVwZGF0ZXIqIHRleHR1cmVVcGRhdGVyKCkgY29uc3QgeyByZXR1cm4gbV90 ZXh0dXJlVXBkYXRlci5nZXQoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5jcHAKaW5k ZXggNmVlZGNjZTcxNDM4NmYwYzU5ZmJhZTgyMDVmOWNmZjMxOGRmZjUxZi4uMWQ2Mjk0OTY0NmZh Y2RmMmRiMDYyNTBlZDcwNjU2YTQ2NzIwOWQyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21p dW0uY3BwCkBAIC0xNDQsMTIgKzE0NCw2IEBAIEltYWdlTGF5ZXJDaHJvbWl1bTo6fkltYWdlTGF5 ZXJDaHJvbWl1bSgpCiB7CiB9CiAKLXZvaWQgSW1hZ2VMYXllckNocm9taXVtOjpjbGVhbnVwUmVz b3VyY2VzKCkKLXsKLSAgICBtX3RleHR1cmVVcGRhdGVyLmNsZWFyKCk7Ci0gICAgVGlsZWRMYXll ckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzKCk7Ci19Ci0KIHZvaWQgSW1hZ2VMYXllckNocm9t aXVtOjpzZXRDb250ZW50cyhJbWFnZSogY29udGVudHMpCiB7CiAgICAgLy8gc2V0Q29udGVudHMo KSBjdXJyZW50bHkgZ2V0cyBjYWxsZWQgd2hlbmV2ZXIgdGhlcmUgaXMgYW55CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hy b21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdl TGF5ZXJDaHJvbWl1bS5oCmluZGV4IDVmZTRmMjY2NjhiZGNjM2UyOWYwNGNmZmNkYTg4MmE3M2Mz MWUzMjcuLjEyNTlhNjYzYzRjYTM2ZDU5MDdkNGRhYWU2NDcxYWU5NDE3MzRjYzYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJD aHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ltYWdlTGF5ZXJDaHJvbWl1bS5oCkBAIC02MSw3ICs2MSw2IEBAIHB1YmxpYzoKIHByaXZhdGU6 CiAgICAgZXhwbGljaXQgSW1hZ2VMYXllckNocm9taXVtKENDTGF5ZXJEZWxlZ2F0ZSopOwogCi0g ICAgdmlydHVhbCB2b2lkIGNsZWFudXBSZXNvdXJjZXMoKTsKICAgICB2aXJ0dWFsIHZvaWQgY3Jl YXRlVGV4dHVyZVVwZGF0ZXIoY29uc3QgQ0NMYXllclRyZWVIb3N0Kik7CiAgICAgdm9pZCBzZXRU aWxpbmdPcHRpb24oVGlsaW5nT3B0aW9uKTsKIAo= 121035 2012-01-03 18:46:08 -0800 2012-01-03 19:39:26 -0800 rebase bug-75288-20120103184607.patch text/plain 3514 epenner U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzOTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzc1ODA1YjM1ZDdmODI0 NTgzYzEwNTgzODY0Y2VlNWZhZTNkZGYzYi4uMWI5ZmRlNTNjNDU5ODBkODRjMmYxY2EzMzA2Yzcz ZjhjODUyYjcwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTAzICBFcmlj IFBlbm5lciAgPGVwZW5uZXJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIFByZXZl bnQgY3Jhc2hpbmcgZHVlIHRvIE5VTEwgdGV4dHVyZSB1cGRhdGVyLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzUyODgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0NvbnRlbnRMYXllckNocm9taXVtLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmg6CisKIDIwMTItMDEtMDMg IEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgRXhjbHVk ZSBNYWMncyBQbGF0Zm9ybUV2ZW50RmFjdG9yeSBmcm9tIGlPUwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExh eWVyQ2hyb21pdW0uY3BwCmluZGV4IDNkNDU5MDAwZDI2YmI3YTgzMWE0ZmNmZTIzMGI4MmQyYTM2 ZjBiNDEuLmVmMTA1YjUzZmZlYWIxMzk5YjUyM2Q4YzdkNzkwMjUxMjVhMzZjOTcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXll ckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5jcHAKQEAgLTg3LDEyICs4Nyw2IEBAIENvbnRlbnRM YXllckNocm9taXVtOjp+Q29udGVudExheWVyQ2hyb21pdW0oKQogewogfQogCi12b2lkIENvbnRl bnRMYXllckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzKCkKLXsKLSAgICBtX3RleHR1cmVVcGRh dGVyLmNsZWFyKCk7Ci0gICAgVGlsZWRMYXllckNocm9taXVtOjpjbGVhbnVwUmVzb3VyY2VzKCk7 Ci19Ci0KIHZvaWQgQ29udGVudExheWVyQ2hyb21pdW06OnBhaW50Q29udGVudHNJZkRpcnR5KCkK IHsKICAgICB1cGRhdGVUaWxlU2l6ZUFuZFRpbGluZ09wdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21p dW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRM YXllckNocm9taXVtLmgKaW5kZXggZjVhZmEwMzMyZDFjZDJiMzk5M2YxYTc4YjAwN2ZjYzE4ZjRk NDI4MS4uYzNkZjFjMjBjODBjMDUyYjVlY2I0NDA4MDdlYmY3YzlkNWI1NDAzYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVy Q2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9Db250ZW50TGF5ZXJDaHJvbWl1bS5oCkBAIC01Niw3ICs1Niw2IEBAIHByb3RlY3RlZDoKICAg ICBleHBsaWNpdCBDb250ZW50TGF5ZXJDaHJvbWl1bShDQ0xheWVyRGVsZWdhdGUqKTsKIAogcHJp dmF0ZToKLSAgICB2aXJ0dWFsIHZvaWQgY2xlYW51cFJlc291cmNlcygpOwogICAgIHZpcnR1YWwg dm9pZCBjcmVhdGVUZXh0dXJlVXBkYXRlcihjb25zdCBDQ0xheWVyVHJlZUhvc3QqKTsKICAgICB2 aXJ0dWFsIExheWVyVGV4dHVyZVVwZGF0ZXIqIHRleHR1cmVVcGRhdGVyKCkgY29uc3QgeyByZXR1 cm4gbV90ZXh0dXJlVXBkYXRlci5nZXQoKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVt LmNwcAppbmRleCA2ZWVkY2NlNzE0Mzg2ZjBjNTlmYmFlODIwNWY5Y2ZmMzE4ZGZmNTFmLi4xZDYy OTQ5NjQ2ZmFjZGYyZGIwNjI1MGVkNzA2NTZhNDY3MjA5ZDI0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZUxheWVyQ2hyb21pdW0uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5 ZXJDaHJvbWl1bS5jcHAKQEAgLTE0NCwxMiArMTQ0LDYgQEAgSW1hZ2VMYXllckNocm9taXVtOjp+ SW1hZ2VMYXllckNocm9taXVtKCkKIHsKIH0KIAotdm9pZCBJbWFnZUxheWVyQ2hyb21pdW06OmNs ZWFudXBSZXNvdXJjZXMoKQotewotICAgIG1fdGV4dHVyZVVwZGF0ZXIuY2xlYXIoKTsKLSAgICBU aWxlZExheWVyQ2hyb21pdW06OmNsZWFudXBSZXNvdXJjZXMoKTsKLX0KLQogdm9pZCBJbWFnZUxh eWVyQ2hyb21pdW06OnNldENvbnRlbnRzKEltYWdlKiBjb250ZW50cykKIHsKICAgICAvLyBzZXRD b250ZW50cygpIGN1cnJlbnRseSBnZXRzIGNhbGxlZCB3aGVuZXZlciB0aGVyZSBpcyBhbnkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdl TGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vSW1hZ2VMYXllckNocm9taXVtLmgKaW5kZXggNWZlNGYyNjY2OGJkY2MzZTI5ZjA0Y2ZmY2Rh ODgyYTczYzMxZTMyNy4uMTI1OWE2NjNjNGNhMzZkNTkwN2Q0ZGFhZTY0NzFhZTk0MTczNGNjNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1h Z2VMYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVtLmgKQEAgLTYxLDcgKzYxLDYgQEAgcHVibGljOgog cHJpdmF0ZToKICAgICBleHBsaWNpdCBJbWFnZUxheWVyQ2hyb21pdW0oQ0NMYXllckRlbGVnYXRl Kik7CiAKLSAgICB2aXJ0dWFsIHZvaWQgY2xlYW51cFJlc291cmNlcygpOwogICAgIHZpcnR1YWwg dm9pZCBjcmVhdGVUZXh0dXJlVXBkYXRlcihjb25zdCBDQ0xheWVyVHJlZUhvc3QqKTsKICAgICB2 b2lkIHNldFRpbGluZ09wdGlvbihUaWxpbmdPcHRpb24pOwogCg==