Skip to content

Commit

Permalink
[iOS][web] Group public methods
Browse files Browse the repository at this point in the history
This CL puts all the public methods together.
It also moves webState, webStateImpl and scrollPosition to private
properties.

Bug: 938255
Change-Id: Ic2b9870da254f538c201893dad87a99f4d18c216
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1503323
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638099}
  • Loading branch information
Gauthier Ambard authored and Commit Bot committed Mar 6, 2019
1 parent edfa68c commit aaf8ef6
Show file tree
Hide file tree
Showing 2 changed files with 599 additions and 585 deletions.
12 changes: 3 additions & 9 deletions ios/web/web_state/ui/crw_web_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ class GURL;

namespace web {
class NavigationItem;
class WebState;
class WebStateImpl;
}

Expand All @@ -65,8 +64,6 @@ class WebStateImpl;
@property(nonatomic, weak) id<CRWNativeContentProvider> nativeProvider;
@property(nonatomic, weak) id<CRWSwipeRecognizerProvider>
swipeRecognizerProvider;
@property(nonatomic, readonly) web::WebState* webState;
@property(nonatomic, readonly) web::WebStateImpl* webStateImpl;

// The container view used to display content. If the view has been purged due
// to low memory, this will recreate it.
Expand All @@ -90,9 +87,6 @@ class WebStateImpl;
// (nothing loaded) and 1.0 (fully loaded).
@property(nonatomic, readonly) double loadingProgress;

// Returns the x, y offset the content has been scrolled.
@property(nonatomic, readonly) CGPoint scrollPosition;

// YES if the web process backing WebView is believed to currently be crashed.
@property(nonatomic, assign, getter=isWebProcessCrashed) BOOL webProcessCrashed;

Expand Down Expand Up @@ -154,9 +148,6 @@ class WebStateImpl;
// navigation. |isRendererInitiated| is NO for browser-initiated navigation.
- (void)reloadWithRendererInitiatedNavigation:(BOOL)isRendererInitiated;

// Stops web view loading.
- (void)stopLoading;

// Loads the URL indicated by current session state.
- (void)loadCurrentURLWithRendererInitiatedNavigation:(BOOL)rendererInitiated;

Expand Down Expand Up @@ -235,6 +226,9 @@ class WebStateImpl;

@interface CRWWebController (UsedOnlyForTesting) // Testing or internal API.

@property(nonatomic, readonly) web::WebState* webState;
@property(nonatomic, readonly) web::WebStateImpl* webStateImpl;

// Returns whether the user is interacting with the page.
@property(nonatomic, readonly) BOOL userIsInteracting;

Expand Down
Loading

0 comments on commit aaf8ef6

Please sign in to comment.