diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/mac/WebView/WebHTMLView.mm | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/mac/WebView/WebHTMLView.mm')
| -rw-r--r-- | Source/WebKit/mac/WebView/WebHTMLView.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit/mac/WebView/WebHTMLView.mm b/Source/WebKit/mac/WebView/WebHTMLView.mm index 82716a6c9..8f12e5bf0 100644 --- a/Source/WebKit/mac/WebView/WebHTMLView.mm +++ b/Source/WebKit/mac/WebView/WebHTMLView.mm @@ -107,6 +107,7 @@ #import <WebCore/Range.h> #import <WebCore/RenderWidget.h> #import <WebCore/RenderView.h> +#import <WebCore/ResourceBuffer.h> #import <WebCore/RunLoop.h> #import <WebCore/RuntimeApplicationChecks.h> #import <WebCore/SharedBuffer.h> @@ -2378,7 +2379,7 @@ static String commandNameForSelector(SEL selector) static const SelectorNameMap* exceptionMap = createSelectorExceptionMap(); SelectorNameMap::const_iterator it = exceptionMap->find(selector); if (it != exceptionMap->end()) - return it->second; + return it->value; // Remove the trailing colon. // No need to capitalize the command name since Editor command names are @@ -3687,7 +3688,7 @@ static bool matchesExtensionOrEquivalent(NSString *filename, NSString *extension if (WebCore::CachedImage* tiffResource = [self promisedDragTIFFDataSource]) { - SharedBuffer *buffer = static_cast<CachedResource*>(tiffResource)->data(); + ResourceBuffer *buffer = static_cast<CachedResource*>(tiffResource)->resourceBuffer(); if (!buffer) goto noPromisedData; |