Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(469)

Issue 1171203004: Correct iOS build for latest Xcode beta. (Closed)

Created:
5 years, 6 months ago by justincohen
Modified:
5 years, 6 months ago
CC:
chromium-reviews, cbentzel+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Correct iOS build for latest Xcode beta. - NSObject's NS_DESIGNATED_INITIALIZER -init method requires an -init NS_UNAVAILABLE implementation. - Correct nonnull API usage. - Cast to NSInteger for comparisons with NSNotFound. - Account for dylib -> tbd change in latest Xcode. BUG=498581, 498825, 498841 Committed: https://crrev.com/5a862993ea3a0c7593ac58971015f8122bda7a56 Cr-Commit-Position: refs/heads/master@{#333756}

Patch Set 1 #

Patch Set 2 : nit #

Total comments: 7

Patch Set 3 : more #

Total comments: 6

Patch Set 4 : Add back test #

Patch Set 5 : format #

Patch Set 6 : remove nonnull and nullable #

Patch Set 7 : Remove test again #

Total comments: 13

Patch Set 8 : UNAVAILABLE_ATTRIBUTE->NS_UNAVAILABLE #

Total comments: 16

Patch Set 9 : nits #

Total comments: 6

Patch Set 10 : Nits #

Patch Set 11 : Nits and move init to end #

Total comments: 4

Patch Set 12 : Nits #

Unified diffs Side-by-side diffs Delta from patch set Stats (+164 lines, -49 lines) Patch
M base/ios/crb_protocol_observers_unittest.mm View 1 2 3 4 5 6 7 8 9 10 11 3 chunks +7 lines, -2 lines 0 comments Download
M ios/chrome/browser/infobars/infobar_controller.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +2 lines, -1 line 0 comments Download
M ios/chrome/browser/infobars/infobar_controller.mm View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +5 lines, -0 lines 0 comments Download
M ios/chrome/browser/translate/before_translate_infobar_controller.mm View 1 2 1 chunk +1 line, -1 line 0 comments Download
M ios/chrome/browser/ui/commands/generic_chrome_command.h View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +3 lines, -3 lines 0 comments Download
M ios/chrome/browser/ui/commands/generic_chrome_command.mm View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +5 lines, -0 lines 0 comments Download
M ios/chrome/browser/updatable_config/updatable_config_base.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -5 lines 0 comments Download
M ios/chrome/browser/xcallback_parameters.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +2 lines, -0 lines 0 comments Download
M ios/chrome/browser/xcallback_parameters.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +6 lines, -0 lines 0 comments Download
M ios/crnet/crnet_environment.mm View 1 2 3 4 5 6 7 8 9 2 chunks +2 lines, -1 line 0 comments Download
A ios/net/empty_nsurlcache.h View 1 2 3 4 5 6 7 8 9 1 chunk +15 lines, -0 lines 0 comments Download
A ios/net/empty_nsurlcache.mm View 1 2 3 4 5 6 7 8 9 1 chunk +17 lines, -0 lines 0 comments Download
M ios/net/ios_net.gyp View 1 2 1 chunk +2 lines, -0 lines 0 comments Download
M ios/net/request_tracker.mm View 1 2 3 1 chunk +5 lines, -1 line 0 comments Download
M ios/public/test/test_updatable_resource_provider.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +6 lines, -0 lines 0 comments Download
M ios/web/browsing_data_managers/crw_cookie_browsing_data_manager.h View 1 2 3 4 5 6 7 8 9 10 1 chunk +2 lines, -0 lines 0 comments Download
M ios/web/browsing_data_managers/crw_cookie_browsing_data_manager.mm View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +5 lines, -0 lines 0 comments Download
M ios/web/crw_browsing_data_store.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +6 lines, -0 lines 0 comments Download
M ios/web/crw_browsing_data_store_unittest.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +6 lines, -0 lines 0 comments Download
M ios/web/net/clients/crw_redirect_network_client.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -5 lines 0 comments Download
M ios/web/net/clients/crw_redirect_network_client_factory.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -5 lines 0 comments Download
M ios/web/shell/view_controller.mm View 1 2 3 4 5 6 7 8 9 2 chunks +2 lines, -1 line 0 comments Download
M ios/web/test/crw_fake_web_controller_observer.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -5 lines 0 comments Download
M ios/web/weak_nsobject_counter.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -5 lines 0 comments Download
M ios/web/web_state/js/crw_js_early_script_manager_unittest.mm View 1 2 3 1 chunk +6 lines, -1 line 0 comments Download
M ios/web/web_state/ui/crw_ui_simple_web_view_controller.mm View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M ios/web/web_state/ui/crw_web_controller_container_view.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -5 lines 0 comments Download
M ios/web/web_state/ui/crw_web_controller_unittest.mm View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +2 lines, -1 line 0 comments Download
M ios/web/web_state/ui/crw_wk_web_view_crash_detector.mm View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +5 lines, -5 lines 0 comments Download
M ios/web/web_state/ui/wk_web_view_configuration_provider_unittest.mm View 1 2 3 4 5 6 7 8 9 2 chunks +4 lines, -0 lines 0 comments Download
M testing/iossim/iossim.mm View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M third_party/class-dump/class-dump.gyp View 1 2 3 4 5 6 7 8 9 1 chunk +16 lines, -1 line 0 comments Download

Messages

Total messages: 26 (5 generated)
justincohen
Do these look correct? I'm not sure if this is the right approach. https://codereview.chromium.org/1171203004/diff/20001/ios/web/shell/view_controller.mm File ...
5 years, 6 months ago (2015-06-10 12:25:57 UTC) #2
sdefresne
https://codereview.chromium.org/1171203004/diff/20001/ios/net/request_tracker.mm File ios/net/request_tracker.mm (right): https://codereview.chromium.org/1171203004/diff/20001/ios/net/request_tracker.mm#newcode37 ios/net/request_tracker.mm:37: DCHECK_EQ(NSNotFound, (NSInteger)[factories_ indexOfObject:factory]); static_cast<NSInteger>(...) https://codereview.chromium.org/1171203004/diff/20001/ios/web/browsing_data_managers/crw_cookie_browsing_data_manager.h File ios/web/browsing_data_managers/crw_cookie_browsing_data_manager.h (right): https://codereview.chromium.org/1171203004/diff/20001/ios/web/browsing_data_managers/crw_cookie_browsing_data_manager.h#newcode18 ...
5 years, 6 months ago (2015-06-10 12:33:20 UTC) #3
droger
https://codereview.chromium.org/1171203004/diff/20001/ios/web/shell/view_controller.mm File ios/web/shell/view_controller.mm (right): https://codereview.chromium.org/1171203004/diff/20001/ios/web/shell/view_controller.mm#newcode133 ios/web/shell/view_controller.mm:133: [NSURLCache setSharedURLCache:[[[NSURLCache alloc] init] autorelease]]; On 2015/06/10 12:25:57, justincohen ...
5 years, 6 months ago (2015-06-10 12:34:09 UTC) #4
justincohen
PTAL. I still need to clean up the comments on the NSNotFound, file a bug, ...
5 years, 6 months ago (2015-06-10 15:05:45 UTC) #5
shreyasv1
https://codereview.chromium.org/1171203004/diff/40001/ios/web/shell/view_controller.mm File ios/web/shell/view_controller.mm (right): https://codereview.chromium.org/1171203004/diff/40001/ios/web/shell/view_controller.mm#newcode134 ios/web/shell/view_controller.mm:134: [NSURLCache setSharedURLCache:[[[EmptyNSURLCache alloc] init] autorelease]]; nit: I see that ...
5 years, 6 months ago (2015-06-10 15:14:35 UTC) #7
justincohen
ptal https://codereview.chromium.org/1171203004/diff/40001/ios/web/shell/view_controller.mm File ios/web/shell/view_controller.mm (right): https://codereview.chromium.org/1171203004/diff/40001/ios/web/shell/view_controller.mm#newcode134 ios/web/shell/view_controller.mm:134: [NSURLCache setSharedURLCache:[[[EmptyNSURLCache alloc] init] autorelease]]; On 2015/06/10 15:14:34, ...
5 years, 6 months ago (2015-06-10 15:21:11 UTC) #8
droger
https://codereview.chromium.org/1171203004/diff/120001/ios/net/empty_nsurlcache.h File ios/net/empty_nsurlcache.h (right): https://codereview.chromium.org/1171203004/diff/120001/ios/net/empty_nsurlcache.h#newcode10 ios/net/empty_nsurlcache.h:10: @interface EmptyNSURLCache : NSURLCache Add a comment. I suggest ...
5 years, 6 months ago (2015-06-10 15:59:10 UTC) #9
justincohen
Done, PTAL! https://codereview.chromium.org/1171203004/diff/120001/ios/net/empty_nsurlcache.h File ios/net/empty_nsurlcache.h (right): https://codereview.chromium.org/1171203004/diff/120001/ios/net/empty_nsurlcache.h#newcode10 ios/net/empty_nsurlcache.h:10: @interface EmptyNSURLCache : NSURLCache On 2015/06/10 15:59:10, ...
5 years, 6 months ago (2015-06-10 16:02:25 UTC) #10
shreyasv1
https://codereview.chromium.org/1171203004/diff/120001/ios/web/web_state/ui/wk_web_view_configuration_provider_unittest.mm File ios/web/web_state/ui/wk_web_view_configuration_provider_unittest.mm (right): https://codereview.chromium.org/1171203004/diff/120001/ios/web/web_state/ui/wk_web_view_configuration_provider_unittest.mm#newcode72 ios/web/web_state/ui/wk_web_view_configuration_provider_unittest.mm:72: // TODO(shreyasv) Disabled for usaging of nil on latest ...
5 years, 6 months ago (2015-06-10 16:04:48 UTC) #11
droger
Thanks! lgtm
5 years, 6 months ago (2015-06-10 16:05:55 UTC) #12
sdefresne
https://codereview.chromium.org/1171203004/diff/140001/base/ios/crb_protocol_observers_unittest.mm File base/ios/crb_protocol_observers_unittest.mm (right): https://codereview.chromium.org/1171203004/diff/140001/base/ios/crb_protocol_observers_unittest.mm#newcode6 base/ios/crb_protocol_observers_unittest.mm:6: #include "base/ios/weak_nsobject.h" #include "base/logging.h" so that you don't break ...
5 years, 6 months ago (2015-06-10 16:15:56 UTC) #13
rohitrao (ping after 24h)
I'll follow up with erikchen about UNAVAILABLE_ATTRIBUTE, but NS_UNAVAILABLE is fine for now. I don't ...
5 years, 6 months ago (2015-06-10 16:18:22 UTC) #15
rohitrao (ping after 24h)
Oh, I would also prefer that the unavailable -init method come directly after the designated ...
5 years, 6 months ago (2015-06-10 16:19:36 UTC) #16
sdefresne
On 2015/06/10 16:19:36, rohitrao (OOO until 6-22) wrote: > Oh, I would also prefer that ...
5 years, 6 months ago (2015-06-10 16:21:58 UTC) #17
justincohen
Moved init to below designed initializer. SDK no longer includes dylib, only .tbd files. I ...
5 years, 6 months ago (2015-06-10 16:33:37 UTC) #18
justincohen
PTAL!
5 years, 6 months ago (2015-06-10 16:33:57 UTC) #19
sdefresne
lgtm https://codereview.chromium.org/1171203004/diff/200001/ios/chrome/browser/infobars/infobar_controller.mm File ios/chrome/browser/infobars/infobar_controller.mm (right): https://codereview.chromium.org/1171203004/diff/200001/ios/chrome/browser/infobars/infobar_controller.mm#newcode19 ios/chrome/browser/infobars/infobar_controller.mm:19: - (instancetype)init { nit: I don't really mind, ...
5 years, 6 months ago (2015-06-10 16:57:28 UTC) #20
justincohen
https://codereview.chromium.org/1171203004/diff/200001/ios/chrome/browser/infobars/infobar_controller.mm File ios/chrome/browser/infobars/infobar_controller.mm (right): https://codereview.chromium.org/1171203004/diff/200001/ios/chrome/browser/infobars/infobar_controller.mm#newcode19 ios/chrome/browser/infobars/infobar_controller.mm:19: - (instancetype)init { On 2015/06/10 16:57:28, sdefresne wrote: > ...
5 years, 6 months ago (2015-06-10 17:06:48 UTC) #21
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1171203004/220001
5 years, 6 months ago (2015-06-10 17:07:36 UTC) #24
commit-bot: I haz the power
Committed patchset #12 (id:220001)
5 years, 6 months ago (2015-06-10 17:38:27 UTC) #25
commit-bot: I haz the power
5 years, 6 months ago (2015-06-10 17:39:19 UTC) #26
Message was sent while issue was closed.
Patchset 12 (id:??) landed as
https://crrev.com/5a862993ea3a0c7593ac58971015f8122bda7a56
Cr-Commit-Position: refs/heads/master@{#333756}

Powered by Google App Engine
This is Rietveld 408576698