diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/page/mac | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/page/mac')
| -rw-r--r-- | WebCore/page/mac/FrameMac.mm | 8 | ||||
| -rw-r--r-- | WebCore/page/mac/WebCoreViewFactory.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/WebCore/page/mac/FrameMac.mm b/WebCore/page/mac/FrameMac.mm index 9e77387..356503f 100644 --- a/WebCore/page/mac/FrameMac.mm +++ b/WebCore/page/mac/FrameMac.mm @@ -416,12 +416,12 @@ NSDictionary* Frame::fontAttributesForSelectionStart() const if (style->color().isValid() && style->color() != Color::black) [result setObject:nsColor(style->color()) forKey:NSForegroundColorAttributeName]; - ShadowData* shadow = style->textShadow(); + const ShadowData* shadow = style->textShadow(); if (shadow) { NSShadow* s = [[NSShadow alloc] init]; - [s setShadowOffset:NSMakeSize(shadow->x, shadow->y)]; - [s setShadowBlurRadius:shadow->blur]; - [s setShadowColor:nsColor(shadow->color)]; + [s setShadowOffset:NSMakeSize(shadow->x(), shadow->y())]; + [s setShadowBlurRadius:shadow->blur()]; + [s setShadowColor:nsColor(shadow->color())]; [result setObject:s forKey:NSShadowAttributeName]; } diff --git a/WebCore/page/mac/WebCoreViewFactory.h b/WebCore/page/mac/WebCoreViewFactory.h index fef856a..db70b6d 100644 --- a/WebCore/page/mac/WebCoreViewFactory.h +++ b/WebCore/page/mac/WebCoreViewFactory.h @@ -142,6 +142,9 @@ - (NSString *)AXMenuListPopupActionVerb; - (NSString *)AXMenuListActionVerb; +- (NSString *)missingPluginText; +- (NSString *)crashedPluginText; + - (NSString *)multipleFileUploadTextForNumberOfFiles:(unsigned)numberOfFiles; // FTP Directory Related - (NSString *)unknownFileSizeText; |