87045 2012-05-21 14:31:11 -0700 [chromium] Build content_shell from within WebKit 2013-04-08 14:56:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 91308 1 jochen jochen dglazkov dpranke eae fishd jam leviw peter schenney webkit.review.bot oldest_to_newest 629499 0 jochen 2012-05-21 14:31:11 -0700 [chromium] Build content_shell from within WebKit 629500 1 143098 jochen 2012-05-21 14:31:44 -0700 Created attachment 143098 Patch 629512 2 jochen 2012-05-21 14:36:56 -0700 this is WIP patch for people that want to experiment with this. I tested this on Linux only The required chromium side is here: https://chromiumcodereview.appspot.com/10388218 629517 3 leviw 2012-05-21 14:38:35 -0700 (In reply to comment #2) > The required chromium side is here: https://chromiumcodereview.appspot.com/10388218 Is there anything stopping us from putting in the Chromium side? It doesn't actually change anything, no? 629518 4 leviw 2012-05-21 14:38:53 -0700 (In reply to comment #3) > Is there anything stopping us from putting in the Chromium side? It doesn't actually change anything, no? (I mean in the standard build case) 629522 5 jochen 2012-05-21 14:41:05 -0700 (In reply to comment #4) > (In reply to comment #3) > > Is there anything stopping us from putting in the Chromium side? It doesn't actually change anything, no? > > (I mean in the standard build case) I just uploaded the CL, gimme a sec! 629525 6 leviw 2012-05-21 14:45:03 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > Is there anything stopping us from putting in the Chromium side? It doesn't actually change anything, no? > > > > (I mean in the standard build case) > > I just uploaded the CL, gimme a sec! Sorry, I wasn't trying to pressure you, just validating my understanding of that patch. 629551 7 jochen 2012-05-21 15:05:25 -0700 here's the steps to build content_shell right now: 1) update-webkit --chromium 2) webkit-patch apply-attachment --no-clean --no-update 143098 3) cd Source/WebKit/chromium; gclient sync 4) curl -o - https://chromiumcodereview.appspot.com/download/issue10388218_4002.diff | patch -p1 5) python ./gyp_webkit 6) webkit-build --chromium --debug this should give you out/Debug/content_shell run with --dump-render-tree for a DRT like interface, or with --remote-debugging-port=9222 for devtools once the chromium side has landed, steps 4 and 5 are not required 629592 8 143098 webkit.review.bot 2012-05-21 15:24:46 -0700 Comment on attachment 143098 Patch Attachment 143098 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/12740556 645739 9 143098 fishd 2012-06-10 22:50:29 -0700 Comment on attachment 143098 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143098&action=review > Source/WebKit/chromium/DEPS:142 > + 'third_party/flac': don't you think this file is getting out of control? the webkit repository shouldn't encode all of these details about what packages are required to build chromium. somehow we should extract that information from a file maintained in the chromium repository. webkit repository should just indicate the version of chromium and the location of the repository. problem: if the set of things chromium depends on changes, then you have to modify this file. the file listing the things chromium depends on should live in the chromium repository so that when those changes are made, they can be made as part of the same CL. 645756 10 jochen 2012-06-10 23:31:10 -0700 It is already out of control... I think the right solution is that the.individual modules in chromium like webkit support or content should specify their own DEPS files instead of having this huge single DEPS in src/ 648381 11 143098 dpranke 2012-06-13 12:50:16 -0700 Comment on attachment 143098 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143098&action=review >> Source/WebKit/chromium/DEPS:142 >> + 'third_party/flac': > > don't you think this file is getting out of control? the webkit repository > shouldn't encode all of these details about what packages are required to > build chromium. somehow we should extract that information from a file > maintained in the chromium repository. webkit repository should just > indicate the version of chromium and the location of the repository. > > problem: if the set of things chromium depends on changes, then you have > to modify this file. the file listing the things chromium depends on > should live in the chromium repository so that when those changes are > made, they can be made as part of the same CL. as an alternative to multiple DEPS files in chrome, maybe we need to add some sort of wildcard or dependency or cascade feature into gclient, so you we could say something like 'content_deps': and have that get expanded to some list on the chromium-side ... 664484 12 fishd 2012-07-08 07:17:04 -0700 Yes, defining a variable like 'content_deps' on the chromium side that WebKit could use seems good. Jochen, the multiple DEPS file things suffers from diamond dependency problems. What happens if two modules don't agree on the version of 'net' or 'base' that they require? A single master list is simpler. 675593 13 153768 jochen 2012-07-23 03:53:25 -0700 Created attachment 153768 Patch 676782 14 154053 peter 2012-07-24 07:12:50 -0700 Created attachment 154053 Changes for Android Hi Jochen, I've attached the changes (to your patch) required to make this work for Android. At this moment we're not yet able to build content_shell itself. Instead, the content_shell_apk target will be sufficient for now, which right now wraps the Java files and creates an .apk. As work continues in bringing content_shell up on the Chromium side, dependencies will be added to the content_shell_apk target (i.e. one on content_shell itself). Concretely, this means that it won't work at all for Android :-). As development still is actively ongoing, I think it's best *not* to add a dependency on either content_shell or content_shell_apk for now when building for Android, mostly to avoid random build breakages after Chromium DEPS rolls. Once the work stabilizes and is closer to being finished, we can enable the dependency and make steps towards switching over. Adding the missing dependencies now should be fine, however. 676788 15 jochen 2012-07-24 07:20:45 -0700 Thank you for the feedback. Right now, this bug is just for people that want to experiment with content shell in WebKit. I don't think it'll ever land, as webkit should not depend on content The plan is (roughly) to add methods to webkit_support for creating a webview that will either be created using TestShell or ContentShell 754419 16 171464 mkwst 2012-10-30 09:17:02 -0700 Created attachment 171464 Adding Mac DEPS. 143098 2012-05-21 14:31:44 -0700 2012-07-23 03:53:20 -0700 Patch bug-87045-20120521233142.patch text/plain 3625 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3ODA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDk0OWI0ZTVlNGM3M2U5ZDc3M2FmMDJmOGQ2NTNmNmI5MTVkYWEwMTMuLjEzNDMxYTY5Mjc2ZjZl NDNiNTZjNGJmZDU1ZWJiM2UxNTJlZTJhYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTItMDUtMjEgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBCdWlsZCBjb250ZW50X3NoZWxsIGZyb20g d2l0aGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODcwNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIEFsbC5neXA6CisgICAgICAgICogREVQUzoKKwogMjAxMi0wNS0xOCAgTWljaGFlbCBO b3JkbWFuICA8bWljaGFlbG5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hyb21pdW1dIERvbVN0 b3JhZ2UgZXZlbnRzIGhhbmRsaW5nIG5lZWRzIFRMQyAoMikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQWxsLmd5cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQWxsLmd5cApp bmRleCAxMjYzYzI1YzMyODFhMGI1ZjAwODUzMGRjNTlhMTM1MDIwYjE5NTUwLi43MDQzNzI0ZjZj NDE5YTM5MmJkZDM4NGFmYmUzOTQyNTBmN2Y4MjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0FsbC5neXAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9BbGwuZ3lwCkBA IC00Myw2ICs0Myw3IEBACiAgICAgICAgICAgICAgICAgJ1dlYktpdFVuaXRUZXN0cy5neXA6d2Vi a2l0X3VuaXRfdGVzdHMnLAogICAgICAgICAgICAgICAgICcuLi8uLi8uLi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwOkR1bXBSZW5kZXJU cmVlJywKICAgICAgICAgICAgICAgICAnLi4vLi4vLi4vVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 V2ViS2l0QVBJLmd5cC9UZXN0V2ViS2l0QVBJLmd5cDpUZXN0V2ViS2l0QVBJJywKKyAgICAgICAg ICAgICAgICAnY29udGVudC9jb250ZW50Lmd5cDpjb250ZW50X3NoZWxsJywKICAgICAgICAgICAg IF0sCiAgICAgICAgIH0KICAgICBdLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9ERVBTIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCmluZGV4IGJlNDEzNWY0ZDZlZDE2 MjQwOTcwOWY2ZmRkMGY3MTk0MWFjYjhkNjYuLjNjMWM2ZWE0MjFhOThhM2UyMmJhNTIzYWVjYzdm MDhiZTM1ODhlNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUworKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMKQEAgLTEwNyw2ICsxMDcsOCBAQCBkZXBzID0g ewogICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2ZmbXBlZycpLAog ICAndGhpcmRfcGFydHkvbGliamluZ2xlL3NvdXJjZSc6CiAgICAgRnJvbSgnY2hyb21pdW1fZGVw cycsICdzcmMvdGhpcmRfcGFydHkvbGliamluZ2xlL3NvdXJjZScpLAorICAndGhpcmRfcGFydHkv d2VicnRjJzoKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS93ZWJy dGMnKSwKICAgJ3Rvb2xzL2dyaXQnOgogICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3Rv b2xzL2dyaXQnKSwKICAgJ3Rvb2xzL2dyaXRzZXR0aW5ncyc6CkBAIC0xMTgsNiArMTIwLDE2IEBA IGRlcHMgPSB7CiAgICd1aSc6CiAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3VpQCcrVmFyKCdj aHJvbWl1bV9yZXYnKSwgIyBuZWVkZWQgYnkgYXBwCiAKKyAgIyBjb250ZW50X3NoZWxsIGRlcGVu ZGVuY2llcworICAnY29udGVudCc6CisgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL2NvbnRlbnRA JytWYXIoJ2Nocm9taXVtX3JldicpLAorICAnamluZ2xlJzoKKyAgICBWYXIoJ2Nocm9taXVtX3N2 bicpKycvamluZ2xlQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKKyAgJ3NhbmRib3gnOgorICAgIFZh cignY2hyb21pdW1fc3ZuJykrJy9zYW5kYm94QCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKKyAgJ3Nl Y2NvbXBzYW5kYm94JzoKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy9zZWNjb21wc2Fu ZGJveCcpLAorCiAgICMgb3RoZXIgdGhpcmQgcGFydHkKICAgJ3RoaXJkX3BhcnR5L3B5ZnRwZGxp Yi9zcmMnOgogICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L3B5ZnRw ZGxpYi9zcmMnKSwKQEAgLTEyNyw4ICsxMzksMTYgQEAgZGVwcyA9IHsKICAgICBGcm9tKCdjaHJv bWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9vdHMnKSwKICAgJ3RoaXJkX3BhcnR5L3lhc20v c291cmNlL3BhdGNoZWQteWFzbSc6CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhp cmRfcGFydHkveWFzbS9zb3VyY2UvcGF0Y2hlZC15YXNtJyksCisgICd0aGlyZF9wYXJ0eS9mbGFj JzoKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9mbGFjJyksCisg ICd0aGlyZF9wYXJ0eS9zcGVleCc6CisgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhp cmRfcGFydHkvc3BlZXgnKSwKICAgJ3RoaXJkX3BhcnR5L2xpYmpwZWdfdHVyYm8nOgogICAgIEZy b20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2xpYmpwZWdfdHVyYm8nKSwKKyAg J3RoaXJkX3BhcnR5L2xpYnNydHAnOgorICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3Ro aXJkX3BhcnR5L2xpYnNydHAnKSwKKyAgJ3RoaXJkX3BhcnR5L2xpYnl1dic6CisgICAgRnJvbSgn Y2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvbGlieXV2JyksCiAgICd0aGlyZF9wYXJ0 eS9sZXZlbGRhdGFiYXNlL3NyYyc6CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhp cmRfcGFydHkvbGV2ZWxkYXRhYmFzZS9zcmMnKSwKICAgJ3RoaXJkX3BhcnR5L3NuYXBweS9zcmMn OgpAQCAtMTM3LDYgKzE1NywxMCBAQCBkZXBzID0gewogICAgIEZyb20oJ2Nocm9taXVtX2RlcHMn LCAnc3JjL3RoaXJkX3BhcnR5L3NmbnRseS9jcHAvc3JjJyksCiAgICd0aGlyZF9wYXJ0eS92OC1p MThuJzoKICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS92OC1pMThu JyksCisgICd0aGlyZF9wYXJ0eS9qc29uY3BwL3NvdXJjZS9pbmNsdWRlJzoKKyAgICBGcm9tKCdj aHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9qc29uY3BwL3NvdXJjZS9pbmNsdWRlJyks CisgICd0aGlyZF9wYXJ0eS9qc29uY3BwL3NvdXJjZS9zcmMvbGliX2pzb24nOgorICAgIEZyb20o J2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2pzb25jcHAvc291cmNlL3NyYy9saWJf anNvbicpLAogICAndGhpcmRfcGFydHknOgogICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy90aGly ZF9wYXJ0eUAnK1ZhcignY2hyb21pdW1fcmV2JyksCiB9Cg== 153768 2012-07-23 03:53:25 -0700 2012-10-30 09:16:56 -0700 Patch bug-87045-20120723125317.patch text/plain 3677 jochen U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzMzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGE5NGJiZDdiNzExZTMwNzRiZjZhNGJiYzIxNDUyODkyNDM2MjI1NGYuLjA3YzZlZDU5MzkwZmZk NWY5Y2FkNmJmMGM4MGZhN2U2OTAyYjQwMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTItMDUtMjEgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBCdWlsZCBjb250ZW50X3NoZWxsIGZyb20g d2l0aGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODcwNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIEFsbC5neXA6CisgICAgICAgICogREVQUzoKKwogMjAxMi0wNy0yMiAgS2VudCBUYW11 cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtLU1hY10gRml4IGEg YnVpbGQgZXJyb3IuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0FsbC5neXAg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0FsbC5neXAKaW5kZXggNzM5YTBjOGVjYzMwMjkzMWM0 M2Y0MDUwOWU1NWQzNTQwNmNiZjBhMy4uY2I2Yjg2ZGYxZTRmM2YxYWUzMGZkODU1ZTVmNmNiYTAy YjkwNGFlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9BbGwuZ3lwCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQWxsLmd5cApAQCAtNDMsNiArNDMsNyBAQAogICAgICAg ICAgICAgICAgICdXZWJLaXRVbml0VGVzdHMuZ3lwOndlYmtpdF91bml0X3Rlc3RzJywKICAgICAg ICAgICAgICAgICAnLi4vLi4vLi4vVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUu Z3lwL0R1bXBSZW5kZXJUcmVlLmd5cDpEdW1wUmVuZGVyVHJlZScsCiAgICAgICAgICAgICAgICAg Jy4uLy4uLy4uL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS5neXAvVGVzdFdlYktp dEFQSS5neXA6VGVzdFdlYktpdEFQSScsCisgICAgICAgICAgICAgICAgJ2NvbnRlbnQvY29udGVu dC5neXA6Y29udGVudF9zaGVsbCcsCiAgICAgICAgICAgICBdLAogICAgICAgICAgICAgJ2NvbmRp dGlvbnMnOiBbCiAgICAgICAgICAgICAgICAgWydPUz09ImFuZHJvaWQiJywgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9E RVBTCmluZGV4IDkwYjdjYWVkOGMzNWE2N2Y1YjM5M2FmYjIwZGQxMWQ0YTQxMThjY2IuLjYwZDEx YTYxNTJlN2RmNzEwYTBlZjE5NGNmM2M0MDhhNTVjZjZkZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vREVQUworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMKQEAg LTEwNyw2ICsxMDcsOCBAQCBkZXBzID0gewogICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3Jj L3RoaXJkX3BhcnR5L2ZmbXBlZycpLAogICAndGhpcmRfcGFydHkvbGliamluZ2xlL3NvdXJjZSc6 CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvbGliamluZ2xlL3Nv dXJjZScpLAorICAndGhpcmRfcGFydHkvd2VicnRjJzoKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBz JywgJ3NyYy90aGlyZF9wYXJ0eS93ZWJydGMnKSwKICAgJ3Rvb2xzL2dyaXQnOgogICAgIEZyb20o J2Nocm9taXVtX2RlcHMnLCAnc3JjL3Rvb2xzL2dyaXQnKSwKICAgJ3Rvb2xzL2dyaXRzZXR0aW5n cyc6CkBAIC0xMTgsNiArMTIwLDE2IEBAIGRlcHMgPSB7CiAgICd1aSc6CiAgICAgVmFyKCdjaHJv bWl1bV9zdm4nKSsnL3VpQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwgIyBuZWVkZWQgYnkgYXBwCiAK KyAgIyBjb250ZW50X3NoZWxsIGRlcGVuZGVuY2llcworICAnY29udGVudCc6CisgICAgVmFyKCdj aHJvbWl1bV9zdm4nKSsnL2NvbnRlbnRAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICAnamluZ2xl JzoKKyAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvamluZ2xlQCcrVmFyKCdjaHJvbWl1bV9yZXYn KSwKKyAgJ3NhbmRib3gnOgorICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy9zYW5kYm94QCcrVmFy KCdjaHJvbWl1bV9yZXYnKSwKKyAgJ3NhbmRib3gvbGludXgvc2VjY29tcC1sZWdhY3knOgorICAg IEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3NhbmRib3gvbGludXgvc2VjY29tcC1sZWdhY3kn KSwKKwogICAjIG90aGVyIHRoaXJkIHBhcnR5CiAgICd0aGlyZF9wYXJ0eS9weWZ0cGRsaWIvc3Jj JzoKICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9weWZ0cGRsaWIv c3JjJyksCkBAIC0xMjcsOCArMTM5LDE2IEBAIGRlcHMgPSB7CiAgICAgRnJvbSgnY2hyb21pdW1f ZGVwcycsICdzcmMvdGhpcmRfcGFydHkvb3RzJyksCiAgICd0aGlyZF9wYXJ0eS95YXNtL3NvdXJj ZS9wYXRjaGVkLXlhc20nOgogICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3Bh cnR5L3lhc20vc291cmNlL3BhdGNoZWQteWFzbScpLAorICAndGhpcmRfcGFydHkvZmxhYyc6Cisg ICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvZmxhYycpLAorICAndGhp cmRfcGFydHkvc3BlZXgnOgorICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3Bh cnR5L3NwZWV4JyksCiAgICd0aGlyZF9wYXJ0eS9saWJqcGVnX3R1cmJvJzoKICAgICBGcm9tKCdj aHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9saWJqcGVnX3R1cmJvJyksCisgICd0aGly ZF9wYXJ0eS9saWJzcnRwJzoKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9w YXJ0eS9saWJzcnRwJyksCisgICd0aGlyZF9wYXJ0eS9saWJ5dXYnOgorICAgIEZyb20oJ2Nocm9t aXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2xpYnl1dicpLAogICAndGhpcmRfcGFydHkvbGV2 ZWxkYXRhYmFzZS9zcmMnOgogICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3Bh cnR5L2xldmVsZGF0YWJhc2Uvc3JjJyksCiAgICd0aGlyZF9wYXJ0eS9zbmFwcHkvc3JjJzoKQEAg LTEzNyw2ICsxNTcsMTAgQEAgZGVwcyA9IHsKICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3Ny Yy90aGlyZF9wYXJ0eS9zZm50bHkvY3BwL3NyYycpLAogICAndGhpcmRfcGFydHkvdjgtaTE4bic6 CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvdjgtaTE4bicpLAor ICAndGhpcmRfcGFydHkvanNvbmNwcC9zb3VyY2UvaW5jbHVkZSc6CisgICAgRnJvbSgnY2hyb21p dW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvanNvbmNwcC9zb3VyY2UvaW5jbHVkZScpLAorICAn dGhpcmRfcGFydHkvanNvbmNwcC9zb3VyY2Uvc3JjL2xpYl9qc29uJzoKKyAgICBGcm9tKCdjaHJv bWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9qc29uY3BwL3NvdXJjZS9zcmMvbGliX2pzb24n KSwKICAgJ3RoaXJkX3BhcnR5JzoKICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhpcmRfcGFy dHlAJytWYXIoJ2Nocm9taXVtX3JldicpLAogfQo= 154053 2012-07-24 07:12:50 -0700 2012-07-24 07:13:20 -0700 Changes for Android content_shell_android_diff.patch text/plain 2170 peter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQWxsLmd5cCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQWxsLmd5cAppbmRleCBjYjZiODZkLi42MmE1NzI1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0FsbC5neXAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9BbGwuZ3lwCkBAIC00Myw3ICs0Myw2IEBACiAgICAgICAgICAgICAgICAgJ1dlYktpdFVuaXRU ZXN0cy5neXA6d2Via2l0X3VuaXRfdGVzdHMnLAogICAgICAgICAgICAgICAgICcuLi8uLi8uLi9U b29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lw OkR1bXBSZW5kZXJUcmVlJywKICAgICAgICAgICAgICAgICAnLi4vLi4vLi4vVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0V2ViS2l0QVBJLmd5cC9UZXN0V2ViS2l0QVBJLmd5cDpUZXN0V2ViS2l0QVBJ JywKLSAgICAgICAgICAgICAgICAnY29udGVudC9jb250ZW50Lmd5cDpjb250ZW50X3NoZWxsJywK ICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKICAgICAgICAgICAg ICAgICBbJ09TPT0iYW5kcm9pZCInLCB7CkBAIC01Miw2ICs1MSwxMCBAQAogICAgICAgICAgICAg ICAgICAgICAgICAgJy4uLy4uLy4uL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVl Lmd5cC9EdW1wUmVuZGVyVHJlZS5neXA6RHVtcFJlbmRlclRyZWVfYXBrJywKICAgICAgICAgICAg ICAgICAgICAgICAgICcuLi8uLi8uLi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEku Z3lwL1Rlc3RXZWJLaXRBUEkuZ3lwOlRlc3RXZWJLaXRBUElfYXBrJywKICAgICAgICAgICAgICAg ICAgICAgXSwKKyAgICAgICAgICAgICAgICB9LCB7ICMgT1MhPSJhbmRyb2lkIgorICAgICAgICAg ICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzogWworICAgICAgICAgICAgICAgICAgICAgICAgJ2Nv bnRlbnQvY29udGVudC5neXA6Y29udGVudF9zaGVsbCcsCisgICAgICAgICAgICAgICAgICAgIF0s CiAgICAgICAgICAgICAgICAgfV0sCiAgICAgICAgICAgICBdLAogICAgICAgICB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0RFUFMKaW5kZXggMmZiYjJkOS4uNmI1ZmIxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9ERVBTCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwpAQCAtMjAxLDE1 ICsyMDEsMTggQEAgZGVwc19vcyA9IHsKICAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3Jj L3RoaXJkX3BhcnR5L29wZW5zc2wnKSwKICAgfSwKICAgJ2FuZHJvaWQnOiB7Ci0gICAgJ3Rvb2xz L2FuZHJvaWQnOgotICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSArICcvdG9vbHMvYW5kcm9pZEAn ICsgVmFyKCdjaHJvbWl1bV9yZXYnKSwKLSAgICAndGhpcmRfcGFydHkvZnJlZXR5cGUnOgotICAg ICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvZnJlZXR5cGUnKSwKICAg ICAndGhpcmRfcGFydHkvYW9zcCc6CiAgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90 aGlyZF9wYXJ0eS9hb3NwJyksCi0gIH0sCisgICAgJ3RoaXJkX3BhcnR5L2ZyZWV0eXBlJzoKKyAg ICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2ZyZWV0eXBlJyksCisg ICAgJ3RoaXJkX3BhcnR5L2xpYnBob25lbnVtYmVyL3NyYy9waG9uZW51bWJlcnMnOgorICAgICAg RnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvbGlicGhvbmVudW1iZXIvc3Jj L3Bob25lbnVtYmVycycpLAorICAgICd0aGlyZF9wYXJ0eS9saWJwaG9uZW51bWJlci9zcmMvcmVz b3VyY2VzJzoKKyAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2xp YnBob25lbnVtYmVyL3NyYy9yZXNvdXJjZXMnKSwKKyAgICAndG9vbHMvYW5kcm9pZCc6CisgICAg ICBWYXIoJ2Nocm9taXVtX3N2bicpICsgJy90b29scy9hbmRyb2lkQCcgKyBWYXIoJ2Nocm9taXVt X3JldicpLAorICAgIH0KIH0KLQogc2tpcF9jaGlsZF9pbmNsdWRlcyA9IFsKICAgICMgRG9uJ3Qg bG9vayBmb3IgZGVwZW5kZW5jaWVzIGluIHRoZSBmb2xsb3dpbmcgZm9sZGVyczogCiAgICAnYmFz ZScsCg== 171464 2012-10-30 09:17:02 -0700 2012-10-30 09:17:02 -0700 Adding Mac DEPS. bug-87045-20121030171526.patch text/plain 4211 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyOTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDFiNWZmM2IwZDM2YWI3OTJkZDUwNjA5NWNkMDhjZmU2OTVjYmZhY2QuLjI5ZjM2MTQ1YzAyOWMz ZDg1ZmU2ZWVlOWI1MGYyMTBjNzljNGNmNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTItMTAtMjkgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBCdWlsZCBjb250ZW50X3NoZWxsIGZyb20g d2l0aGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODcwNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIEFsbC5neXA6CisgICAgICAgICogREVQUzoKKwogMjAxMi0xMC0zMCAgS2VudCBUYW11 cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmVtb3ZlIHVudXNlZCBjb2RlIGZv ciBvbGQgaW5wdXRbdHlwZT1kYXRlXSBVSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS8uZ2l0aWdub3JlIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS8uZ2l0aWdub3JlCmluZGV4 IGJmYTU3ZjRjOGE2N2IyOGM4NWEwOWM0ZWE5MmMwZTQ2ZjZlNTFlYjguLjQ2OWZiNjRkNTc4YjEz MTJkMjU4YWU1YTRmOGEzN2Q2YWZlN2UwNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vLmdpdGlnbm9yZQorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtLy5naXRpZ25vcmUK QEAgLTM5LDMgKzM5LDggQEAgdWkvCiB2OC8KIHdlYmtpdC8KIHhjb2RlYnVpbGQvCisKKyMgQ29u dGVudCBTaGVsbAorY29udGVudC8KK2ppbmdsZS8KK3NhbmRib3gvCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0FsbC5neXAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0FsbC5n eXAKaW5kZXggODgyMTIwMjA3NWJmZjM5ZjYwZDc1ZTU3NmIzOTJiNjk3M2QwOWJlYi4uNmY3ODdk NjVkMDZhM2I3ZWJkNjc1Y2JhMzRlYWI5YzExODNmYWIwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9BbGwuZ3lwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQWxsLmd5 cApAQCAtNDMsNiArNDMsNyBAQAogICAgICAgICAgICAgICAgICdXZWJLaXRVbml0VGVzdHMuZ3lw OndlYmtpdF91bml0X3Rlc3RzJywKICAgICAgICAgICAgICAgICAnLi4vLi4vLi4vVG9vbHMvRHVt cFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cDpEdW1wUmVu ZGVyVHJlZScsCiAgICAgICAgICAgICAgICAgJy4uLy4uLy4uL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdFdlYktpdEFQSS5neXAvVGVzdFdlYktpdEFQSS5neXA6VGVzdFdlYktpdEFQSScsCisgICAg ICAgICAgICAgICAgJ2NvbnRlbnQvY29udGVudC5neXA6Y29udGVudF9zaGVsbCcsCiAgICAgICAg ICAgICBdLAogICAgICAgICAgICAgJ2NvbmRpdGlvbnMnOiBbCiAgICAgICAgICAgICAgICAgWydP Uz09ImFuZHJvaWQiJywgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBT IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCmluZGV4IDFjM2ZiMzgzNWM1MWNhYzFhMDkx YWM2MDgzNjdhNzM5YTM4NWI3ZTIuLjZhOTRhZmEzNjk5NDg3NmI5YjcwZmQzYjQ2NjY3ZGYwZWM5 NzY5YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUworKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0RFUFMKQEAgLTExMyw2ICsxMTMsOCBAQCBkZXBzID0gewogICAg IEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2ZmbXBlZycpLAogICAndGhp cmRfcGFydHkvbGliamluZ2xlL3NvdXJjZSc6CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdz cmMvdGhpcmRfcGFydHkvbGliamluZ2xlL3NvdXJjZScpLAorICAndGhpcmRfcGFydHkvd2VicnRj JzoKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS93ZWJydGMnKSwK ICAgJ3Rvb2xzL2dyaXQnOgogICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3Rvb2xzL2dy aXQnKSwKICAgJ3Rvb2xzL2dyaXRzZXR0aW5ncyc6CkBAIC0xMjQsNiArMTI2LDIwIEBAIGRlcHMg PSB7CiAgICd1aSc6CiAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3VpQCcrVmFyKCdjaHJvbWl1 bV9yZXYnKSwKIAorICAjIGNvbnRlbnRfc2hlbGwgZGVwZW5kZW5jaWVzCisgICdjb250ZW50JzoK KyAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvY29udGVudEAnK1ZhcignY2hyb21pdW1fcmV2Jyks CisgICdqaW5nbGUnOgorICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy9qaW5nbGVAJytWYXIoJ2No cm9taXVtX3JldicpLAorICAnc2FuZGJveCc6CisgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3Nh bmRib3hAJytWYXIoJ2Nocm9taXVtX3JldicpLAorICAnc2FuZGJveC9saW51eC9zZWNjb21wLWxl Z2FjeSc6CisgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvc2FuZGJveC9saW51eC9zZWNj b21wLWxlZ2FjeScpLAorICAndG9vbHMvcHJvdG9jX3dyYXBwZXInOgorICAgIFZhcignY2hyb21p dW1fc3ZuJykrJy90b29scy9wcm90b2Nfd3JhcHBlckAnK1ZhcignY2hyb21pdW1fcmV2JyksCisg ICd0aGlyZF9wYXJ0eS9vcHVzL3NyYyc6CisgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMv dGhpcmRfcGFydHkvb3B1cy9zcmMnKSwKKwogICAjIG90aGVyIHRoaXJkIHBhcnR5CiAgICd0aGly ZF9wYXJ0eS9weWZ0cGRsaWIvc3JjJzoKICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90 aGlyZF9wYXJ0eS9weWZ0cGRsaWIvc3JjJyksCkBAIC0xMzMsOCArMTQ5LDE2IEBAIGRlcHMgPSB7 CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvb3RzJyksCiAgICd0 aGlyZF9wYXJ0eS95YXNtL3NvdXJjZS9wYXRjaGVkLXlhc20nOgogICAgIEZyb20oJ2Nocm9taXVt X2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L3lhc20vc291cmNlL3BhdGNoZWQteWFzbScpLAorICAn dGhpcmRfcGFydHkvZmxhYyc6CisgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRf cGFydHkvZmxhYycpLAorICAndGhpcmRfcGFydHkvc3BlZXgnOgorICAgIEZyb20oJ2Nocm9taXVt X2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L3NwZWV4JyksCiAgICd0aGlyZF9wYXJ0eS9saWJqcGVn X3R1cmJvJzoKICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9saWJq cGVnX3R1cmJvJyksCisgICd0aGlyZF9wYXJ0eS9saWJzcnRwJzoKKyAgICBGcm9tKCdjaHJvbWl1 bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9saWJzcnRwJyksCisgICd0aGlyZF9wYXJ0eS9saWJ5 dXYnOgorICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2xpYnl1dicp LAogICAndGhpcmRfcGFydHkvbGV2ZWxkYXRhYmFzZS9zcmMnOgogICAgIEZyb20oJ2Nocm9taXVt X2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2xldmVsZGF0YWJhc2Uvc3JjJyksCiAgICd0aGlyZF9w YXJ0eS9zbmFwcHkvc3JjJzoKQEAgLTE0Myw2ICsxNjcsMTAgQEAgZGVwcyA9IHsKICAgICBGcm9t KCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9zZm50bHkvY3BwL3NyYycpLAogICAn dGhpcmRfcGFydHkvdjgtaTE4bic6CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhp cmRfcGFydHkvdjgtaTE4bicpLAorICAndGhpcmRfcGFydHkvanNvbmNwcC9zb3VyY2UvaW5jbHVk ZSc6CisgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvanNvbmNwcC9z b3VyY2UvaW5jbHVkZScpLAorICAndGhpcmRfcGFydHkvanNvbmNwcC9zb3VyY2Uvc3JjL2xpYl9q c29uJzoKKyAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9qc29uY3Bw L3NvdXJjZS9zcmMvbGliX2pzb24nKSwKICAgJ3RoaXJkX3BhcnR5JzoKICAgICBWYXIoJ2Nocm9t aXVtX3N2bicpKycvdGhpcmRfcGFydHlAJytWYXIoJ2Nocm9taXVtX3JldicpLAogfQo=