Attachment 338889 Details for Bug 184799 – Patch v3 (fixed ChangeLog typo from v2)

[patch] Patch v3 (fixed ChangeLog typo from v2)

bug-184799-20180426103359.patch (text/plain), 3.35 KB, created by David Kilzer (:ddkilzer) on 2018-04-26 10:34:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2018-04-26 10:34:00 PDT

Size: 3.35 KB

patch

obsolete

>Subversion Revision: 230824
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 58cc5af3b620b9938af18167cd6e0530eddde5a7..906b283d4abb9ee5a1cb346edaec83932e8c4435 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-04-26  David Kilzer  <ddkilzer@apple.com>
>+
>+        Make WAKScrollView delegate a weak property
>+        <https://webkit.org/b/184799>
>+        <rdar://problem/39469669>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/ios/wak/WAKScrollView.h:
>+        - Remove `delegate` instance variable declaration.
>+        - Declare `delegate` property as weak.
>+        (-[WAKScrollView setDelegate:]): Delete declaration.
>+        (-[WAKScrollView delegate]): Ditto.
>+        * platform/ios/wak/WAKScrollView.mm:
>+        - Synthesize getter/setter methods for `delegate` property.
>+        (-[WAKScrollView setDelegate:]): Delete implementation.
>+        (-[WAKScrollView delegate]): Ditto.
>+
> 2018-04-19  David Kilzer  <ddkilzer@apple.com>
> 
>         Enable Objective-C weak references
>diff --git a/Source/WebCore/platform/ios/wak/WAKScrollView.h b/Source/WebCore/platform/ios/wak/WAKScrollView.h
>index b769aa8d5a64dcaeb5d221044e6f5eb9242995eb..586dc87bfbefb96b0f838bc065fac961e03ce40a 100644
>--- a/Source/WebCore/platform/ios/wak/WAKScrollView.h
>+++ b/Source/WebCore/platform/ios/wak/WAKScrollView.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
>+ * Copyright (C) 2005-2018 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -38,7 +38,6 @@ WEBCORE_EXPORT @interface WAKScrollView : WAKView <WebCoreFrameScrollView>
> {
>     WAKView *_documentView;  // Only here so the ObjC instance stays around.
>     WAKClipView *_contentView;
>-    id _delegate;
>     NSPoint _scrollOrigin;
> }
> 
>@@ -57,8 +56,7 @@ WEBCORE_EXPORT @interface WAKScrollView : WAKView <WebCoreFrameScrollView>
> - (BOOL)drawsBackground;
> - (float)horizontalLineScroll;
> 
>-- (void)setDelegate:(id)delegate;
>-- (id)delegate;
>+@property (nonatomic, weak) id delegate;
> 
> - (CGRect)unobscuredContentRect;
> - (void)setActualScrollPosition:(CGPoint)point;
>diff --git a/Source/WebCore/platform/ios/wak/WAKScrollView.mm b/Source/WebCore/platform/ios/wak/WAKScrollView.mm
>index 78e6132582966034c2ca16c9a66bc14926546d92..598322ba646016574197d1ca4e0fc3b7ca533a01 100644
>--- a/Source/WebCore/platform/ios/wak/WAKScrollView.mm
>+++ b/Source/WebCore/platform/ios/wak/WAKScrollView.mm
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
>+ * Copyright (C) 2005-2018 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -62,6 +62,8 @@ static void _notificationCallback(WKViewRef v, WKViewNotificationType type, void
> 
> @implementation WAKScrollView
> 
>+@synthesize delegate;
>+
> - (id)initWithFrame:(CGRect)rect
> {
>     WKViewRef view = WKViewCreateWithFrame(rect, &viewContext);
>@@ -114,16 +116,6 @@ - (BOOL)hasHorizontalScroller
>     return NO;
> }
> 
>-- (void)setDelegate:(id)delegate
>-{
>-    _delegate = delegate;
>-}
>-
>-- (id)delegate
>-{
>-    return _delegate;
>-}
>-
> - (CGRect)documentVisibleRect 
> {
>     return [_contentView documentVisibleRect];

Actions: View | Formatted Diff | Diff

Attachments on bug 184799: 338374 | 338378 | 338887 | 338889