diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:11:43 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:14:42 +0100 |
| commit | e78cbe89e6f337f2f1fe40315be88f742b547151 (patch) | |
| tree | d778000b84a04f24bbad50c7fa66244365e960e9 /WebCore/platform/chromium | |
| parent | 7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff) | |
| download | external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.zip external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.gz external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.bz2 | |
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Diffstat (limited to 'WebCore/platform/chromium')
6 files changed, 4 insertions, 20 deletions
diff --git a/WebCore/platform/chromium/ChromiumBridge.h b/WebCore/platform/chromium/ChromiumBridge.h index 9aa714e..c84931b 100644 --- a/WebCore/platform/chromium/ChromiumBridge.h +++ b/WebCore/platform/chromium/ChromiumBridge.h @@ -225,7 +225,7 @@ namespace WebCore { static void paintTrackbar( GraphicsContext*, int part, int state, int classicState, const IntRect&); static void paintProgressBar( - GraphicsContext*, const IntRect& barRect, int valuePart, const IntRect& valueRect); + GraphicsContext*, const IntRect& barRect, const IntRect& valueRect, bool determinate, double animatedSeconds); #endif // Trace Event -------------------------------------------------------- diff --git a/WebCore/platform/chromium/ClipboardChromium.cpp b/WebCore/platform/chromium/ClipboardChromium.cpp index ab9f3c9..750ff30 100644 --- a/WebCore/platform/chromium/ClipboardChromium.cpp +++ b/WebCore/platform/chromium/ClipboardChromium.cpp @@ -38,7 +38,6 @@ #include "HTMLNames.h" #include "Image.h" #include "MIMETypeRegistry.h" -#include "NamedAttrMap.h" #include "NamedNodeMap.h" #include "Pasteboard.h" #include "PlatformString.h" diff --git a/WebCore/platform/chromium/ClipboardUtilitiesChromium.cpp b/WebCore/platform/chromium/ClipboardUtilitiesChromium.cpp index 5d9ed05..b0680ac 100644 --- a/WebCore/platform/chromium/ClipboardUtilitiesChromium.cpp +++ b/WebCore/platform/chromium/ClipboardUtilitiesChromium.cpp @@ -52,16 +52,4 @@ void replaceNBSPWithSpace(String& str) str.replace(NonBreakingSpaceCharacter, SpaceCharacter); } -String urlToMarkup(const KURL& url, const String& title) -{ - String markup("<a href=\""); - markup.append(url.string()); - markup.append("\">"); - // FIXME: HTML escape this, possibly by moving into the glue layer so we - // can use net/base/escape.h. - markup.append(title); - markup.append("</a>"); - return markup; -} - } // namespace WebCore diff --git a/WebCore/platform/chromium/ClipboardUtilitiesChromium.h b/WebCore/platform/chromium/ClipboardUtilitiesChromium.h index 23fd29c..7514280 100644 --- a/WebCore/platform/chromium/ClipboardUtilitiesChromium.h +++ b/WebCore/platform/chromium/ClipboardUtilitiesChromium.h @@ -38,6 +38,4 @@ void replaceNewlinesWithWindowsStyleNewlines(String&); #endif void replaceNBSPWithSpace(String&); -String urlToMarkup(const KURL&, const String&); - } // namespace WebCore diff --git a/WebCore/platform/chromium/DragDataChromium.cpp b/WebCore/platform/chromium/DragDataChromium.cpp index 8fb40de..1ce20dc 100644 --- a/WebCore/platform/chromium/DragDataChromium.cpp +++ b/WebCore/platform/chromium/DragDataChromium.cpp @@ -66,11 +66,10 @@ String DragData::asURL(String* title) const String url; if (m_platformDragData->hasValidURL()) url = m_platformDragData->getURL().string(); - else if (m_platformDragData->filenames.size() == 1) { + else if (!m_platformDragData->filenames.isEmpty()) { String fileName = m_platformDragData->filenames[0]; fileName = ChromiumBridge::getAbsolutePath(fileName); - if (fileExists(fileName) && !ChromiumBridge::isDirectory(fileName)) - url = ChromiumBridge::filePathToURL(fileName).string(); + url = ChromiumBridge::filePathToURL(fileName).string(); } // |title| can be NULL diff --git a/WebCore/platform/chromium/GeolocationServiceChromium.cpp b/WebCore/platform/chromium/GeolocationServiceChromium.cpp index 4402fe4..9333999 100644 --- a/WebCore/platform/chromium/GeolocationServiceChromium.cpp +++ b/WebCore/platform/chromium/GeolocationServiceChromium.cpp @@ -37,7 +37,7 @@ namespace WebCore { GeolocationServiceChromium::GeolocationServiceChromium(GeolocationServiceClient* c) : GeolocationService(c), - m_geolocation(reinterpret_cast<Geolocation*>(c)), + m_geolocation(static_cast<Geolocation*>(c)), m_geolocationServiceBridge(ChromiumBridge::createGeolocationServiceBridge(this)), m_lastError(PositionError::create(PositionError::POSITION_UNAVAILABLE, "")) { |