Changeset 160872 in webkit

Timestamp:

Dec 19, 2013 4:22:50 PM (10 years ago)

Author:

benjamin@webkit.org

Message:

Remove WKContentViewPrivate.h, WKContentView.h is private now
​https://bugs.webkit.org/show_bug.cgi?id=125981

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2013-12-19
Reviewed by Dan Bernstein.

There is no need for a separate header, WKContentView has become an implementation
detail of WKView.

• UIProcess/API/ios/WKContentView.h:
• UIProcess/API/ios/WKContentViewInternal.h:
• UIProcess/API/ios/WKContentViewPrivate.h: Removed.
• UIProcess/API/ios/WKView.mm:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/ios/WKContentView.h (modified) (2 diffs)
• UIProcess/API/ios/WKContentView.mm (modified) (3 diffs)
• UIProcess/API/ios/WKContentViewInternal.h (modified) (1 diff)
• UIProcess/API/ios/WKContentViewPrivate.h (deleted)
• UIProcess/API/ios/WKView.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-19  Benjamin Poulain  <bpoulain@apple.com>
+
+        Remove WKContentViewPrivate.h, WKContentView.h is private now
+        https://bugs.webkit.org/show_bug.cgi?id=125981
+
+        Reviewed by Dan Bernstein.
+
+        There is no need for a separate header, WKContentView has become an implementation
+        detail of WKView.
+
+        * UIProcess/API/ios/WKContentView.h:
+        * UIProcess/API/ios/WKContentViewInternal.h:
+        * UIProcess/API/ios/WKContentViewPrivate.h: Removed.
+        * UIProcess/API/ios/WKView.mm:
+
 2013-12-19  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.h

@@ -25 +25 @@
 
 #import <UIKit/UIKit.h>
+#import <WebKit2/WKBase.h>
 #import <WebKit2/WKBrowsingContextController.h>
 #import <WebKit2/WKBrowsingContextGroup.h>
@@ -55 +56 @@
 @property (nonatomic, readonly) WKContentType contentType;
 
+@property (readonly) WKPageRef _pageRef;
+
+- (id)initWithFrame:(CGRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef;
+- (id)initWithFrame:(CGRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef relatedToPage:(WKPageRef)relatedPage;
 - (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
 

trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm

@@ -61 +61 @@
 }
 
+- (id)initWithFrame:(CGRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef
+{
+    return [self initWithFrame:frame contextRef:contextRef pageGroupRef:pageGroupRef relatedToPage:nullptr];
+}
+
+- (id)initWithFrame:(CGRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef relatedToPage:(WKPageRef)relatedPage
+{
+    if (!(self = [super initWithFrame:frame]))
+        return nil;
+
+    [self _commonInitializationWithContextRef:contextRef pageGroupRef:pageGroupRef relatedToPage:relatedPage];
+    return self;
+}
+
 - (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup
 {
@@ -112 +126 @@
 }
 
+- (WKPageRef)_pageRef
+{
+    return toAPI(_page.get());
+}
+
 - (void)setMinimumSize:(CGSize)size
 {
@@ -258 +277 @@
 
 @end
-
-@implementation WKContentView (Private)
-
-- (WKPageRef)_pageRef
-{
-    return toAPI(_page.get());
-}
-
-- (id)initWithFrame:(CGRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef
-{
-    return [self initWithFrame:frame contextRef:contextRef pageGroupRef:pageGroupRef relatedToPage:nullptr];
-}
-
-- (id)initWithFrame:(CGRect)frame contextRef:(WKContextRef)contextRef pageGroupRef:(WKPageGroupRef)pageGroupRef relatedToPage:(WKPageRef)relatedPage
-{
-    if (!(self = [super initWithFrame:frame]))
-        return nil;
-
-    [self _commonInitializationWithContextRef:contextRef pageGroupRef:pageGroupRef relatedToPage:relatedPage];
-    return self;
-}
-
-@end

trunk/Source/WebKit2/UIProcess/API/ios/WKContentViewInternal.h

@@ -24 +24 @@
  */
 
-#import "WKContentViewPrivate.h"
+#import "WKContentView.h"
 #import <wtf/Forward.h>
 #import <wtf/Vector.h>

trunk/Source/WebKit2/UIProcess/API/ios/WKView.mm

@@ -29 +29 @@
 #import "WKBrowsingContextGroupPrivate.h"
 #import "WKContentView.h"
-#import "WKContentViewPrivate.h"
 #import "WKProcessGroupPrivate.h"
 #import "WKScrollView.h"