Remove unused public method

This commit is contained in:
Horcrux
2017-01-16 14:38:43 +08:00
parent a981585b6b
commit 7c9f6b2d3d
11 changed files with 38 additions and 68 deletions
+2 -9
View File
@@ -24,13 +24,14 @@
svg.responsible = YES;
}
[node mergeProperties:self mergeList:self.attributeList inherited:YES];
[node mergeProperties:self];
[node renderTo:context];
if ([node isKindOfClass: [RNSVGRenderable class]]) {
RNSVGRenderable *renderable = node;
[self concatLayoutBoundingBox:[renderable getLayoutBoundingBox]];
}
return YES;
}];
}
@@ -113,12 +114,4 @@
}
- (void)resetProperties
{
[self traverseSubviews:^(RNSVGNode *node) {
[node resetProperties];
return YES;
}];
}
@end
+1 -2
View File
@@ -27,9 +27,8 @@
if (template) {
[self beginTransparencyLayer:context];
[self clip:context];
[template mergeProperties:self mergeList:self.attributeList inherited:YES];
[template mergeProperties:self];
[template renderTo:context];
[template resetProperties];
[self endTransparencyLayer:context];
} else if (self.href) {
// TODO: calling yellow box here
+1 -11
View File
@@ -68,17 +68,7 @@
*/
- (void)saveDefinition;
/**
* just for template node to merge target node`s properties into owned properties
*/
- (void)mergeProperties:(__kindof RNSVGNode *)target mergeList:(NSArray<NSString *> *)mergeList;
- (void)mergeProperties:(__kindof RNSVGNode *)target mergeList:(NSArray<NSString *> *)mergeList inherited:(BOOL)inherited;
/**
* just for template node to reset all owned properties once after rendered.
*/
- (void)resetProperties;
- (void)mergeProperties:(__kindof RNSVGNode *)target;
- (void)beginTransparencyLayer:(CGContextRef)context;
+1 -11
View File
@@ -181,12 +181,7 @@
}
}
- (void)mergeProperties:(__kindof RNSVGNode *)target mergeList:(NSArray<NSString *> *)mergeList
{
// abstract
}
- (void)mergeProperties:(__kindof RNSVGNode *)target mergeList:(NSArray<NSString *> *)mergeList inherited:(BOOL)inherited
- (void)mergeProperties:(__kindof RNSVGNode *)target
{
// abstract
}
@@ -202,11 +197,6 @@
}
}
- (void)resetProperties
{
// abstract
}
- (void)dealloc
{
CGPathRelease(_cachedClipPath);
+1 -1
View File
@@ -28,7 +28,6 @@
@property (nonatomic, assign) RNSVGCGFloatArray strokeDasharray;
@property (nonatomic, assign) CGFloat strokeDashoffset;
@property (nonatomic, copy) NSArray<NSString *> *propList;
@property (nonatomic, strong) NSArray<NSString *> *attributeList;
- (void)setContextBoundingBox:(CGRect)contextBoundingBox;
- (CGRect)getContextBoundingBox;
@@ -39,5 +38,6 @@
- (RNSVGPercentageConverter *)getWidthConverter;
- (RNSVGPercentageConverter *)getHeightConverter;
- (void)setHitArea:(CGPathRef)path;
- (NSArray<NSString *> *)getAttributeList;
@end
+20 -19
View File
@@ -11,7 +11,8 @@
@implementation RNSVGRenderable
{
NSMutableDictionary *_originProperties;
NSArray *_lastMergedList;
NSArray<NSString *> *_lastMergedList;
NSArray<NSString *> *_attributeList;
RNSVGPercentageConverter *_widthConverter;
RNSVGPercentageConverter *_heightConverter;
CGRect _contextBoundingBox;
@@ -138,8 +139,8 @@
if (propList == _propList) {
return;
}
_attributeList = [propList copy];
_propList = propList;
_propList = _attributeList = propList;
[self invalidate];
}
@@ -347,37 +348,35 @@
return [_heightConverter stringToFloat:string];
}
- (void)mergeProperties:(__kindof RNSVGNode *)target mergeList:(NSArray<NSString *> *)mergeList
- (NSArray<NSString *> *)getAttributeList
{
[self mergeProperties:target mergeList:mergeList inherited:NO];
return _attributeList;
}
- (void)mergeProperties:(__kindof RNSVGNode *)target mergeList:(NSArray<NSString *> *)mergeList inherited:(BOOL)inherited
- (void)mergeProperties:(__kindof RNSVGNode *)target
{
_lastMergedList = mergeList;
if (_lastMergedList) {
[self resetProperties];
}
if (mergeList.count == 0) {
NSArray<NSString *> *targetAttributeList = [target getAttributeList];
if (targetAttributeList.count == 0) {
return;
}
NSMutableArray* attributeList = [self.propList mutableCopy];
_originProperties = [[NSMutableDictionary alloc] init];
for (NSString *key in mergeList) {
if (inherited) {
if (![attributeList containsObject:key]) {
[attributeList addObject:key];
[_originProperties setValue:[self valueForKey:key] forKey:key];
[self setValue:[target valueForKey:key] forKey:key];
}
} else {
for (NSString *key in targetAttributeList) {
if (![attributeList containsObject:key]) {
[attributeList addObject:key];
[_originProperties setValue:[self valueForKey:key] forKey:key];
[self setValue:[target valueForKey:key] forKey:key];
}
}
_lastMergedList = targetAttributeList;
_attributeList = [attributeList copy];
}
@@ -386,7 +385,9 @@
for (NSString *key in _lastMergedList) {
[self setValue:[_originProperties valueForKey:key] forKey:key];
}
_attributeList = [_propList copy];
_lastMergedList = nil;
_attributeList = _propList;
}
@end
+1 -1
View File
@@ -160,7 +160,7 @@
return CGAffineTransformTranslate(transform, -translateX * (_fromSymbol ? scaleX : 1), -translateY * (_fromSymbol ? scaleY : 1));
}
- (void)mergeProperties:(__kindof RNSVGNode *)target mergeList:(NSArray<NSString *> *)mergeList inherited:(BOOL)inherited
- (void)mergeProperties:(__kindof RNSVGNode *)target
{
if ([target isKindOfClass:[RNSVGUse class]]) {
RNSVGUse *use = target;