Merge WebKit at r61871: Initial merge by git.

Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5

5 files changed, 13 insertions, 9 deletions

diff --git a/WebCore/platform/graphics/wince/FontCacheWince.cpp b/WebCore/platform/graphics/wince/FontCacheWince.cpp
index 3262fc0..6b5dfa5 100644
--- a/WebCore/platform/graphics/wince/FontCacheWince.cpp
+++ b/WebCore/platform/graphics/wince/FontCacheWince.cpp
@@ -51,7 +51,7 @@ static IMLangFontLink2* langFontLink = 0;
 static IMLangFontLink* langFontLink = 0;
 #endif
 
-IMultiLanguage* getMultiLanguageInterface()
+IMultiLanguage* FontCache::getMultiLanguageInterface()
 {
     if (!multiLanguage)
         CoCreateInstance(CLSID_CMultiLanguage, 0, CLSCTX_INPROC_SERVER, IID_IMultiLanguage, (void**)&multiLanguage);
diff --git a/WebCore/platform/graphics/wince/FontPlatformData.h b/WebCore/platform/graphics/wince/FontPlatformData.h
index 77803d3..bb49f75 100644
--- a/WebCore/platform/graphics/wince/FontPlatformData.h
+++ b/WebCore/platform/graphics/wince/FontPlatformData.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef FontPlatformDataWince_H
-#define FontPlatformDataWince_H
+#ifndef FontPlatformData_h
+#define FontPlatformData_h
 
 #include "FontDescription.h"
 #include "StringImpl.h"
diff --git a/WebCore/platform/graphics/wince/FontWince.cpp b/WebCore/platform/graphics/wince/FontWince.cpp
index f8b1886..c0948c0 100644
--- a/WebCore/platform/graphics/wince/FontWince.cpp
+++ b/WebCore/platform/graphics/wince/FontWince.cpp
@@ -242,8 +242,12 @@ float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFon
     return w;
 }
 
-int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool includePartialGlyphs) const
+int Font::offsetForPositionForComplexText(const TextRun& run, float xFloat, bool includePartialGlyphs) const
 {
+    // FIXME: This truncation is not a problem for HTML, but only affects SVG, which passes floating-point numbers
+    // to Font::offsetForPosition(). Bug http://webkit.org/b/40673 tracks fixing this problem.
+    int position = static_cast<int>(xFloat);
+
     TextRunComponents components;
     int w = generateComponents(&components, *this, run);
 
@@ -308,7 +312,7 @@ static float cursorToX(const Font* font, const TextRunComponents& components, in
     return width;
 }
 
-FloatRect Font::selectionRectForComplexText(const TextRun& run, const IntPoint& pt,
+FloatRect Font::selectionRectForComplexText(const TextRun& run, const FloatPoint& pt,
                                      int h, int from, int to) const
 {
     TextRunComponents components;
diff --git a/WebCore/platform/graphics/wince/GraphicsContextWince.cpp b/WebCore/platform/graphics/wince/GraphicsContextWince.cpp
index 5896f90..c2c29c7 100644
--- a/WebCore/platform/graphics/wince/GraphicsContextWince.cpp
+++ b/WebCore/platform/graphics/wince/GraphicsContextWince.cpp
@@ -1249,7 +1249,7 @@ void GraphicsContext::fillRoundedRect(const IntRect& fillRect, const IntSize& to
     if (!m_data->m_dc)
         return;
 
-    IntSize shadowSize;
+    FloatSize shadowSize;
     float shadowBlur = 0;
     Color shadowColor;
         
@@ -1550,7 +1550,7 @@ void GraphicsContext::fillRect(const FloatRect& rect)
         fillRect(rect, fillColor(), DeviceColorSpace);
 }
 
-void GraphicsContext::setPlatformShadow(const IntSize&, float, const Color&, ColorSpace)
+void GraphicsContext::setPlatformShadow(const FloatSize&, float, const Color&, ColorSpace)
 {
     notImplemented();
 }
@@ -1672,7 +1672,7 @@ void GraphicsContext::drawText(const SimpleFontData* fontData, const GlyphBuffer
         return;
     }
 
-    IntSize shadowSize;
+    FloatSize shadowSize;
     float shadowBlur = 0;
     Color shadowColor;
     bool hasShadow = textDrawingMode() == cTextFill
diff --git a/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp b/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp
index ceb5a7c..6fb262d 100644
--- a/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp
+++ b/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp
@@ -109,7 +109,7 @@ void WebMediaPlayerProxy::initEngine()
         }
     }
     serviceType = "application/x-mplayer2";
-    frame->loader()->requestObject(static_cast<RenderPartObject*>(element->renderer()), url, nullAtom, serviceType, paramNames, paramValues);
+    frame->loader()->subframeLoader()->requestObject(static_cast<RenderPartObject*>(element->renderer()), url, nullAtom, serviceType, paramNames, paramValues);
     m_init = true;
 
 }