Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: Source/WebKit/chromium/src/PlatformBridge.cpp

Issue 7356002: Merge 90308 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebKit/chromium/public/WebMimeRegistry.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 { 573 {
574 return webKitClient()->mimeRegistry()->supportsNonImageMIMEType(mimeType) 574 return webKitClient()->mimeRegistry()->supportsNonImageMIMEType(mimeType)
575 != WebMimeRegistry::IsNotSupported; 575 != WebMimeRegistry::IsNotSupported;
576 } 576 }
577 577
578 String PlatformBridge::mimeTypeForExtension(const String& extension) 578 String PlatformBridge::mimeTypeForExtension(const String& extension)
579 { 579 {
580 return webKitClient()->mimeRegistry()->mimeTypeForExtension(extension); 580 return webKitClient()->mimeRegistry()->mimeTypeForExtension(extension);
581 } 581 }
582 582
583 String PlatformBridge::wellKnownMimeTypeForExtension(const String& extension)
584 {
585 return webKitClient()->mimeRegistry()->wellKnownMimeTypeForExtension(extensi on);
586 }
587
583 String PlatformBridge::mimeTypeFromFile(const String& path) 588 String PlatformBridge::mimeTypeFromFile(const String& path)
584 { 589 {
585 return webKitClient()->mimeRegistry()->mimeTypeFromFile(path); 590 return webKitClient()->mimeRegistry()->mimeTypeFromFile(path);
586 } 591 }
587 592
588 String PlatformBridge::preferredExtensionForMIMEType(const String& mimeType) 593 String PlatformBridge::preferredExtensionForMIMEType(const String& mimeType)
589 { 594 {
590 return webKitClient()->mimeRegistry()->preferredExtensionForMIMEType(mimeTyp e); 595 return webKitClient()->mimeRegistry()->preferredExtensionForMIMEType(mimeTyp e);
591 } 596 }
592 597
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 } 1058 }
1054 1059
1055 #if ENABLE(WORKERS) 1060 #if ENABLE(WORKERS)
1056 WorkerContextProxy* WorkerContextProxy::create(Worker* worker) 1061 WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
1057 { 1062 {
1058 return WebWorkerClientImpl::createWorkerContextProxy(worker); 1063 return WebWorkerClientImpl::createWorkerContextProxy(worker);
1059 } 1064 }
1060 #endif 1065 #endif
1061 1066
1062 } // namespace WebCore 1067 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/public/WebMimeRegistry.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698