121491 2013-09-17 07:26:37 -0700 Buildfix for !(ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)) platforms 2013-09-17 08:09:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110141 1 ossy ossy ossy oldest_to_newest 930204 0 ossy 2013-09-17 07:26:37 -0700 The NetworkProcess build is broken now, because DocumentLoader::scheduleArchiveLoad() is called unconditionally from Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp. DocumentLoader::scheduleArchiveLoad() is defined inside ENABLE(WEB_ARCHIVE) || ENABLE(MHTML) block, so this call should be in same guard. 930207 1 211903 ossy 2013-09-17 07:33:49 -0700 Created attachment 211903 Patch 930220 2 211903 ossy 2013-09-17 08:09:00 -0700 Comment on attachment 211903 Patch Clearing flags on attachment: 211903 Committed r155956: <http://trac.webkit.org/changeset/155956> 930221 3 ossy 2013-09-17 08:09:05 -0700 All reviewed patches have been landed. Closing bug. 211903 2013-09-17 07:33:49 -0700 2013-09-17 08:09:00 -0700 Patch bug-121491-20130917163412.patch text/plain 2177 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1OTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggM2IwOTI5NTM3YjZhZDc3 M2FiOWE5MjE3ODRkZTY5NTA4MDlmNThhNy4uYzk2ZDRiYmJiMDNkNDU5NWUxMWVkM2RmZmQyMGM2 Nzc3ZTljNzcxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA5LTE3ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgQnVpbGRmaXggZm9y ICEoRU5BQkxFKFdFQl9BUkNISVZFKSB8fCBFTkFCTEUoTUhUTUwpKSBwbGF0Zm9ybXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTQ5MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9O ZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVMb2FkKToKKwogMjAxMy0wOS0xNyAgQWxi ZXJ0byBHYXJjaWEgIDxiZXJ0b0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFVucmV2aWV3 ZWQgbWFrZSBkaXN0Y2hlY2sgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZFNjaGVkdWxlci5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAppbmRleCBh ZTQ0YjhkMDUwNGYwNzJhM2JiMGQwZDhkMmI2YmMxYmUwN2NiMWFhLi4xMmFlMjNiZWUwZjcwZTg0 ZDNhMDRlM2JiYjc0ZmFmODRmZTljMmJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyLmNwcApA QCAtOTEsNiArOTEsNyBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFNjaGVkdWxlcjo6c2NoZWR1bGVM b2FkKFJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciwgQ2FjaAogICAgIFJlc291cmNlTG9h ZElkZW50aWZpZXIgaWRlbnRpZmllciA9IHJlc291cmNlTG9hZGVyLT5pZGVudGlmaWVyKCk7CiAg ICAgQVNTRVJUKGlkZW50aWZpZXIpOwogCisjaWYgRU5BQkxFKFdFQl9BUkNISVZFKSB8fCBFTkFC TEUoTUhUTUwpCiAgICAgLy8gSWYgdGhlIERvY3VtZW50TG9hZGVyIHNjaGVkdWxlcyB0aGlzIGFz IGFuIGFyY2hpdmUgcmVzb3VyY2UgbG9hZCwKICAgICAvLyB0aGVuIHdlIHNob3VsZCByZW1lbWJl ciB0aGUgUmVzb3VyY2VMb2FkZXIgaW4gb3VyIHJlY29yZHMgYnV0IG5vdCBzY2hlZHVsZSBpdCBp biB0aGUgTmV0d29ya1Byb2Nlc3MuCiAgICAgaWYgKHJlc291cmNlTG9hZGVyLT5kb2N1bWVudExv YWRlcigpLT5zY2hlZHVsZUFyY2hpdmVMb2FkKHJlc291cmNlTG9hZGVyLCByZXNvdXJjZUxvYWRl ci0+cmVxdWVzdCgpKSkgewpAQCAtOTgsNyArOTksOCBAQCB2b2lkIFdlYlJlc291cmNlTG9hZFNj aGVkdWxlcjo6c2NoZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyKiByZXNvdXJjZUxvYWRlciwgQ2Fj aAogICAgICAgICBtX3dlYlJlc291cmNlTG9hZGVycy5zZXQoaWRlbnRpZmllciwgV2ViUmVzb3Vy Y2VMb2FkZXI6OmNyZWF0ZShyZXNvdXJjZUxvYWRlcikpOwogICAgICAgICByZXR1cm47CiAgICAg fQotICAgIAorI2VuZGlmCisKICAgICBMT0coTmV0d29ya1NjaGVkdWxpbmcsICIoV2ViUHJvY2Vz cykgV2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyOjpzY2hlZHVsZUxvYWQsIHVybCAnJXMnIHdpbGwg YmUgc2NoZWR1bGVkIHdpdGggdGhlIE5ldHdvcmtQcm9jZXNzIHdpdGggcHJpb3JpdHkgJWkiLCBy ZXNvdXJjZUxvYWRlci0+dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgcHJpb3JpdHkpOwog CiAgICAgQ29udGVudFNuaWZmaW5nUG9saWN5IGNvbnRlbnRTbmlmZmluZ1BvbGljeSA9IHJlc291 cmNlTG9hZGVyLT5zaG91bGRTbmlmZkNvbnRlbnQoKSA/IFNuaWZmQ29udGVudCA6IERvTm90U25p ZmZDb250ZW50Owo=