Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot

17 files changed, 75 insertions, 174 deletions

diff --git a/Source/WebKit/chromium/public/WebAccessibilityObject.h b/Source/WebKit/chromium/public/WebAccessibilityObject.h
index 029f43872..3a32a95ee 100644
--- a/Source/WebKit/chromium/public/WebAccessibilityObject.h
+++ b/Source/WebKit/chromium/public/WebAccessibilityObject.h
@@ -69,6 +69,7 @@ public:
     WEBKIT_EXPORT bool equals(const WebAccessibilityObject&) const;
 
     bool isNull() const { return m_private.isNull(); }
+    // isDetached also checks for null, so it's safe to just call isDetached.
     WEBKIT_EXPORT bool isDetached() const;
 
     // Static methods for enabling accessibility.
@@ -77,11 +78,17 @@ public:
 
     WEBKIT_EXPORT int axID() const;
 
+    // Update the underlying tree, and return true if this object is
+    // still valid (not detached). Note that calling this method
+    // can cause other WebAccessibilityObjects to become invalid, too,
+    // so always call isDetached if updateBackingStoreAndCheckValidity
+    // has been called on any object, or if any other WebCore code has run.
+    WEBKIT_EXPORT bool updateBackingStoreAndCheckValidity();
+
     WEBKIT_EXPORT WebString accessibilityDescription() const;
     WEBKIT_EXPORT WebString actionVerb() const;
     WEBKIT_EXPORT bool canSetFocusAttribute() const;
     WEBKIT_EXPORT bool canSetValueAttribute() const;
-    WEBKIT_EXPORT bool isValid() const;
 
     WEBKIT_EXPORT unsigned childCount() const;
 
@@ -126,6 +133,7 @@ public:
     WEBKIT_EXPORT WebString ariaLiveRegionRelevant() const;
     WEBKIT_EXPORT WebString ariaLiveRegionStatus() const;
     WEBKIT_EXPORT WebRect boundingBoxRect() const;
+    WEBKIT_EXPORT bool canvasHasFallbackContent() const;
     WEBKIT_EXPORT double estimatedLoadingProgress() const;
     WEBKIT_EXPORT WebString helpText() const;
     WEBKIT_EXPORT int headingLevel() const;
@@ -142,6 +150,7 @@ public:
     WEBKIT_EXPORT WebAccessibilityObject titleUIElement() const;
     WEBKIT_EXPORT WebURL url() const;
 
+    WEBKIT_EXPORT bool supportsRangeValue() const;
     WEBKIT_EXPORT WebString valueDescription() const;
     WEBKIT_EXPORT float valueForRange() const;
     WEBKIT_EXPORT float maxValueForRange() const;
diff --git a/Source/WebKit/chromium/public/WebAccessibilityRole.h b/Source/WebKit/chromium/public/WebAccessibilityRole.h
index f40c1d99b..db8fbcbd4 100644
--- a/Source/WebKit/chromium/public/WebAccessibilityRole.h
+++ b/Source/WebKit/chromium/public/WebAccessibilityRole.h
@@ -49,6 +49,7 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleBrowser,
     WebAccessibilityRoleBusyIndicator,
     WebAccessibilityRoleButton,
+    WebAccessibilityRoleCanvas,
     WebAccessibilityRoleCell, 
     WebAccessibilityRoleCheckBox,
     WebAccessibilityRoleColorWell,
@@ -74,6 +75,7 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleGrowArea,
     WebAccessibilityRoleHeading,
     WebAccessibilityRoleHelpTag,
+    WebAccessibilityRoleHorizontalRule,
     WebAccessibilityRoleIgnored,
     WebAccessibilityRoleImage,
     WebAccessibilityRoleImageMap,
diff --git a/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h b/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h
index ef277d5fd..2133e8508 100644
--- a/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h
+++ b/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h
@@ -26,6 +26,7 @@
 #ifndef WebActiveWheelFlingParameters_h
 #define WebActiveWheelFlingParameters_h
 
+#include "WebInputEvent.h"
 #include "platform/WebCommon.h"
 
 #include "platform/WebFloatPoint.h"
@@ -39,11 +40,13 @@ struct WebActiveWheelFlingParameters {
     WebPoint point;
     WebPoint globalPoint;
     int modifiers;
+    WebGestureEvent::SourceDevice sourceDevice;
     WebSize cumulativeScroll;
     double startTime;
 
     WebActiveWheelFlingParameters()
         : modifiers(0)
+        , sourceDevice(WebGestureEvent::Touchpad)
         , startTime(0)
     {
     }
diff --git a/Source/WebKit/chromium/public/WebCompositorInputHandlerClient.h b/Source/WebKit/chromium/public/WebCompositorInputHandlerClient.h
index 7c911d8f8..a4c4f62c3 100644
--- a/Source/WebKit/chromium/public/WebCompositorInputHandlerClient.h
+++ b/Source/WebKit/chromium/public/WebCompositorInputHandlerClient.h
@@ -35,12 +35,12 @@ public:
     // Callbacks invoked from the compositor thread.
     virtual void willShutdown() = 0;
 
-    // Exactly one of the following two callbacks will be invoked after every call to WebCompositor::handleInputEvent():
+    // Exactly one of the following two callbacks will be invoked after every call to WebCompositorInputHandler::handleInputEvent():
 
-    // Called when the WebCompositor handled the input event and no further processing is required.
+    // Called when the WebCompositorInputHandler handled the input event and no further processing is required.
     virtual void didHandleInputEvent() = 0;
 
-    // Called when the WebCompositor did not handle the input event. If sendToWidget is true, the input event
+    // Called when the WebCompositorInputHandler did not handle the input event. If sendToWidget is true, the input event
     // should be forwarded to the WebWidget associated with this compositor for further processing.
     virtual void didNotHandleInputEvent(bool sendToWidget) = 0;
 
diff --git a/Source/WebKit/chromium/public/WebFrame.h b/Source/WebKit/chromium/public/WebFrame.h
index 06531df8f..56cbe1ea4 100644
--- a/Source/WebKit/chromium/public/WebFrame.h
+++ b/Source/WebKit/chromium/public/WebFrame.h
@@ -415,6 +415,9 @@ public:
     // Returns true if a user gesture is currently being processed.
     virtual bool isProcessingUserGesture() const = 0;
 
+    // Returns true if a consumable gesture exists and has been successfully consumed.
+    virtual bool consumeUserGesture() const = 0;
+
     // Returns true if this frame is in the process of opening a new frame
     // with a suppressed opener.
     virtual bool willSuppressOpenerInNewFrame() const = 0;
@@ -469,10 +472,29 @@ public:
     // there is ranged selection.
     virtual bool selectWordAroundCaret() = 0;
 
+    // DEPRECATED: Use moveSelectionStart / moveSelectionEnd / moveCaret
+    // This method is intended for touch-based UIs, but it's missing some
+    // functionality needed on Android, like preventing collapsed selections.
     virtual void selectRange(const WebPoint& start, const WebPoint& end) = 0;
 
     virtual void selectRange(const WebRange&) = 0;
 
+    // The methods below are for adjusting the start and/or end of the current
+    // selection by direct manipulation on a touch-based UI. To enter selection
+    // mode in the first place, call selectRange() or send a fake mouse event.
+
+    // Moves the start of the current selection, keeping the end fixed.
+    // Returns true on success, false if there is no selection to modify.
+    virtual bool moveSelectionStart(const WebPoint&, bool allowCollapsedSelection) = 0;
+
+    // Moves the end of the current selection, keeping the start fixed.
+    // Returns true on success, false if there is no selection to modify.
+    virtual bool moveSelectionEnd(const WebPoint&, bool allowCollapsedSelection) = 0;
+
+    // Move both endpoints of the current selection to the given position.
+    // The caret will remain pinned inside the current editable region.
+    // Returns true on success, false if there is no selection or if we're not editing.
+    virtual bool moveCaret(const WebPoint&) = 0;
 
     // Printing ------------------------------------------------------------
 
diff --git a/Source/WebKit/chromium/public/WebIDBFactory.h b/Source/WebKit/chromium/public/WebIDBFactory.h
index f10a8eb9a..70c8c840c 100644
--- a/Source/WebKit/chromium/public/WebIDBFactory.h
+++ b/Source/WebKit/chromium/public/WebIDBFactory.h
@@ -41,6 +41,7 @@ namespace WebKit {
 
 class WebFrame;
 class WebIDBDatabase;
+class WebIDBDatabaseCallbacks;
 class WebSecurityOrigin;
 
 // The entry point into the IndexedDatabase API.  These classes match their Foo and
@@ -54,16 +55,13 @@ public:
 
     virtual void getDatabaseNames(WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
 
-    // FIXME: Delete this method when derived classes in chromium have
-    // implemented the other open method.
-    virtual void open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir)
-    {
-        open(name, WebIDBMetadata::NoIntVersion, callbacks, origin, frame, dataDir);
-    }
-
+    // FIXME: This overload should be removed when WK90411 lands.
     // The WebKit implementation of open ignores the WebFrame* parameter.
     virtual void open(const WebString& name, long long version, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
 
+    // The WebKit implementation of open ignores the WebFrame* parameter.
+    virtual void open(const WebString& name, long long version, WebIDBCallbacks* callbacks, WebIDBDatabaseCallbacks* databaseCallbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
+
     virtual void deleteDatabase(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
 };
 
diff --git a/Source/WebKit/chromium/public/WebIDBKey.h b/Source/WebKit/chromium/public/WebIDBKey.h
index 0b704cac2..3819de875 100644
--- a/Source/WebKit/chromium/public/WebIDBKey.h
+++ b/Source/WebKit/chromium/public/WebIDBKey.h
@@ -35,9 +35,6 @@ namespace WebCore { class IDBKey; }
 
 namespace WebKit {
 
-class WebIDBKeyPath;
-class WebSerializedScriptValue;
-
 class WebIDBKey {
 public:
     // Please use one of the factory methods. This is public only to allow WebVector.
@@ -50,8 +47,6 @@ public:
     WEBKIT_EXPORT static WebIDBKey createNumber(double);
     WEBKIT_EXPORT static WebIDBKey createInvalid();
     WEBKIT_EXPORT static WebIDBKey createNull();
-    WEBKIT_EXPORT static WebIDBKey createFromValueAndKeyPath(const WebSerializedScriptValue&, const WebIDBKeyPath&);
-    WEBKIT_EXPORT static WebSerializedScriptValue injectIDBKeyIntoSerializedValue(const WebIDBKey&, const WebSerializedScriptValue&, const WebIDBKeyPath&);
 
     WebIDBKey(const WebIDBKey& e) { assign(e); }
     WebIDBKey& operator=(const WebIDBKey& e)
diff --git a/Source/WebKit/chromium/public/WebInputEvent.h b/Source/WebKit/chromium/public/WebInputEvent.h
index d1f5173e9..63ce7131c 100644
--- a/Source/WebKit/chromium/public/WebInputEvent.h
+++ b/Source/WebKit/chromium/public/WebInputEvent.h
@@ -151,6 +151,10 @@ public:
         // event and back will not preserve these flags.
         CapsLockOn       = 1 << 9,
         NumLockOn        = 1 << 10,
+
+        // Left/right modifiers for keyboard events.
+        IsLeft           = 1 << 11,
+        IsRight          = 1 << 12,
     };
 
     static const int InputModifiers = ShiftKey | ControlKey | AltKey | MetaKey;
@@ -237,7 +241,11 @@ public:
     // |windowsKeyCode| is the Windows key code associated with this key
     // event.  Sometimes it's direct from the event (i.e. on Windows),
     // sometimes it's via a mapping function.  If you want a list, see
-    // WebCore/platform/chromium/KeyboardCodes* .
+    // WebCore/platform/chromium/KeyboardCodes* . Note that this should
+    // ALWAYS store the non-locational version of a keycode as this is
+    // what is returned by the Windows API. For example, it should
+    // store VK_SHIFT instead of VK_RSHIFT. The location information
+    // should be stored in |modifiers|.
     int windowsKeyCode;
 
     // The actual key code genenerated by the platform.  The DOM spec runs
@@ -279,6 +287,9 @@ public:
     // Sets keyIdentifier based on the value of windowsKeyCode.  This is
     // handy for generating synthetic keyboard events.
     WEBKIT_EXPORT void setKeyIdentifierFromWindowsKeyCode();
+
+    static int windowsKeyCodeWithoutLocation(int keycode);
+    static int locationModifiersFromWindowsKeyCode(int keycode);
 };
 
 // WebMouseEvent --------------------------------------------------------------
@@ -365,6 +376,11 @@ public:
 
 class WebGestureEvent : public WebInputEvent {
 public:
+    enum SourceDevice {
+        Touchpad,
+        Touchscreen,
+    };
+
     int x;
     int y;
     int globalX;
@@ -398,6 +414,7 @@ public:
       struct {
         float velocityX;
         float velocityY;
+        SourceDevice sourceDevice;
       } flingStart;
 
       struct {
diff --git a/Source/WebKit/chromium/public/WebMediaPlayer.h b/Source/WebKit/chromium/public/WebMediaPlayer.h
index ed62754d3..e0395ccd3 100644
--- a/Source/WebKit/chromium/public/WebMediaPlayer.h
+++ b/Source/WebKit/chromium/public/WebMediaPlayer.h
@@ -186,6 +186,7 @@ public:
     virtual WebTimeRanges sourceBuffered(const WebString& id) { return WebTimeRanges(); };
     virtual bool sourceAppend(const WebString& id, const unsigned char* data, unsigned length) { return false; }
     virtual bool sourceAbort(const WebString& id) { return false; }
+    virtual void sourceSetDuration(double) { }
     virtual void sourceEndOfStream(EndOfStreamStatus)  { }
     virtual bool sourceSetTimestampOffset(const WebString& id, double offset) { return false; }
 
diff --git a/Source/WebKit/chromium/public/WebRuntimeFeatures.h b/Source/WebKit/chromium/public/WebRuntimeFeatures.h
index 7152249e5..012efe82d 100644
--- a/Source/WebKit/chromium/public/WebRuntimeFeatures.h
+++ b/Source/WebKit/chromium/public/WebRuntimeFeatures.h
@@ -63,7 +63,7 @@ public:
 
     WEBKIT_EXPORT static void enableApplicationCache(bool);
     WEBKIT_EXPORT static bool isApplicationCacheEnabled();
-    
+
     WEBKIT_EXPORT static void enableDataTransferItems(bool);
     WEBKIT_EXPORT static bool isDataTransferItemsEnabled();
 
@@ -76,6 +76,7 @@ public:
     WEBKIT_EXPORT static void enableWebAudio(bool);
     WEBKIT_EXPORT static bool isWebAudioEnabled();
 
+    // TODO: Remove these (since they're no-ops) once Chromium code stops calling them.
     WEBKIT_EXPORT static void enablePushState(bool);
     WEBKIT_EXPORT static bool isPushStateEnabled(bool);
 
@@ -99,7 +100,7 @@ public:
 
     WEBKIT_EXPORT static void enableFileSystem(bool);
     WEBKIT_EXPORT static bool isFileSystemEnabled();
-    
+
     WEBKIT_EXPORT static void enableJavaScriptI18NAPI(bool);
     WEBKIT_EXPORT static bool isJavaScriptI18NAPIEnabled();
 
diff --git a/Source/WebKit/chromium/public/WebSettings.h b/Source/WebKit/chromium/public/WebSettings.h
index e1e74a9b9..f47ff9f7c 100644
--- a/Source/WebKit/chromium/public/WebSettings.h
+++ b/Source/WebKit/chromium/public/WebSettings.h
@@ -103,6 +103,7 @@ public:
     virtual void setForceCompositingMode(bool) = 0;
     virtual void setFrameFlatteningEnabled(bool) = 0;
     virtual void setFullScreenEnabled(bool) = 0;
+    virtual void setGestureTapHighlightEnabled(bool) = 0;
     virtual void setHyperlinkAuditingEnabled(bool) = 0;
     virtual void setImagesEnabled(bool) = 0;
     virtual void setInteractiveFormValidationEnabled(bool) = 0;
diff --git a/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h b/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h
deleted file mode 100644
index 65d4024a2..000000000
--- a/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebTouchCandidatesInfo_h
-#define WebTouchCandidatesInfo_h
-
-#include "platform/WebRect.h"
-
-namespace WebKit {
-
-struct WebTouchCandidatesInfo {
-    // The number of possible touch receivers from the last touch.
-    int numberOfCandidates;
-
-    // The bounds of the possible touch candidates. This will enclose the
-    // rects of any possible touch candidates for a press.
-    WebRect unitedBounds;
-
-    // The smallest dimension (either width or height) of any of the
-    // available touch targets.
-    int smallestDimension;
-
-    WebTouchCandidatesInfo()
-        : numberOfCandidates(0)
-        , smallestDimension(0)
-    {
-    }
-};
-
-} // namespace WebKit
-
-#endif
diff --git a/Source/WebKit/chromium/public/WebView.h b/Source/WebKit/chromium/public/WebView.h
index e95ec6b53..5bb5712fa 100644
--- a/Source/WebKit/chromium/public/WebView.h
+++ b/Source/WebKit/chromium/public/WebView.h
@@ -60,11 +60,9 @@ class WebString;
 class WebTextFieldDecoratorClient;
 class WebViewClient;
 struct WebActiveWheelFlingParameters;
-struct WebFloatQuad;
 struct WebMediaPlayerAction;
 struct WebPluginAction;
 struct WebPoint;
-struct WebTouchCandidatesInfo;
 
 class WebView : public WebWidget {
 public:
@@ -469,20 +467,6 @@ public:
 
     virtual WebViewBenchmarkSupport* benchmarkSupport() { return 0; }
 
-
-    // Touch ----------------------------------------------------------------
-
-    // Returns a list of layout bounding boxes of the event target node touched by
-    // the input point with the padding. If no target node is found, an empty
-    // list is returned. If the node is of an inline type, each line box is returned
-    // separately. Otherwise, one bounding box is returned. Also returns information
-    // about the found candidates and their dimension, and the highlight color to use.
-    virtual WebVector<WebFloatQuad> getTouchHighlightQuads(const WebPoint&,
-                                                           int padding,
-                                                           WebTouchCandidatesInfo& outTouchInfo,
-                                                           WebColor& outTapHighlightColor) = 0;
-
-
     // Visibility -----------------------------------------------------------
 
     // Sets the visibility of the WebView.
diff --git a/Source/WebKit/chromium/public/WebViewClient.h b/Source/WebKit/chromium/public/WebViewClient.h
index 904d4a2d2..839ed0d17 100644
--- a/Source/WebKit/chromium/public/WebViewClient.h
+++ b/Source/WebKit/chromium/public/WebViewClient.h
@@ -62,6 +62,7 @@ class WebFileChooserCompletion;
 class WebFrame;
 class WebGeolocationClient;
 class WebGeolocationService;
+class WebGestureEvent;
 class WebHelperPlugin;
 class WebHitTestResult;
 class WebIconLoadingCompletion;
@@ -84,6 +85,7 @@ struct WebConsoleMessage;
 struct WebContextMenuData;
 struct WebPoint;
 struct WebPopupMenuInfo;
+struct WebRect;
 struct WebSize;
 struct WebWindowFeatures;
 
@@ -285,6 +287,9 @@ public:
     // unless the view did not need a layout.
     virtual void didUpdateLayout() { }
 
+    // Return true to swallow the input event if the embedder will start a disambiguation popup
+    virtual bool didTapMultipleTargets(const WebGestureEvent&, const WebVector<WebRect>& targetRects) { return false; }
+
     // Session history -----------------------------------------------------
 
     // Tells the embedder to navigate back or forward in session history by
diff --git a/Source/WebKit/chromium/public/linux/WebFontInfo.h b/Source/WebKit/chromium/public/linux/WebFontInfo.h
index ed88b9306..a5758f1d4 100644
--- a/Source/WebKit/chromium/public/linux/WebFontInfo.h
+++ b/Source/WebKit/chromium/public/linux/WebFontInfo.h
@@ -28,51 +28,4 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebFontInfo_h
-#define WebFontInfo_h
-
-#include "../linux/WebFontRenderStyle.h"
-#include "../platform/WebCString.h"
-#include "../platform/linux/WebFontFamily.h"
-
-#include <string.h>
-#include <unistd.h>
-
-namespace WebKit {
-
-class WebFontInfo {
-public:
-    // Set a global preference describing whether renderStyleForStrike() should
-    // enable subpixel positioning or not. FontConfig doesn't currently provide
-    // a parameter for controlling this.
-    WEBKIT_EXPORT static void setSubpixelPositioning(bool);
-
-    // Return a font family which provides glyphs for the Unicode code points
-    // specified by |utf16|
-    //   characters: a native-endian UTF16 string
-    //   numCharacters: the number of 16-bit words in |utf16|
-    //   preferredLocale: preferred locale identifier for the |characters|
-    //                    (e.g. "en", "ja", "zh-CN")
-    //
-    // Returns: the font family or an empty string if the request could not be
-    // satisfied.
-    // Returns: the font family instance. The instance has an empty font name if the request could not be satisfied.
-    WEBKIT_EXPORT static void familyForChars(const WebUChar* characters, size_t numCharacters, const char* preferredLocale, WebFontFamily*);
-
-    // Fill out the given WebFontRenderStyle with the user's preferences for
-    // rendering the given font at the given size (in pixels).
-    //   family: i.e. "Times New Roman"
-    //   sizeAndStyle:
-    //      3322222222221111111111
-    //      10987654321098765432109876543210
-    //     +--------------------------------+
-    //     |..............Size............IB|
-    //     +--------------------------------+
-    //     I: italic flag
-    //     B: bold flag
-    WEBKIT_EXPORT static void renderStyleForStrike(const char* family, int sizeAndStyle, WebFontRenderStyle* result);
-};
-
-} // namespace WebKit
-
-#endif
+#include "../../../../Platform/chromium/public/linux/WebFontInfo.h"
diff --git a/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h b/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h
index f4858f3ec..26f61aa4b 100644
--- a/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h
+++ b/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h
@@ -28,36 +28,4 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebFontRenderStyle_h
-#define WebFontRenderStyle_h
-
-#include "../platform/WebCommon.h"
-
-namespace WebCore { struct FontRenderStyle; }
-
-namespace WebKit {
-
-struct WEBKIT_EXPORT WebFontRenderStyle {
-    // Each of the use* members below can take one of three values:
-    //   0: off
-    //   1: on
-    //   2: no preference expressed
-    char useBitmaps; // use embedded bitmap strike if possible
-    char useAutoHint; // use 'auto' hinting (FreeType specific)
-    char useHinting; // hint glyphs to the pixel grid
-    char hintStyle; // level of hinting, 0..3
-    char useAntiAlias; // antialias glyph shapes
-    char useSubpixelRendering; // use subpixel rendering (partially-filled pixels)
-    char useSubpixelPositioning; // use subpixel positioning (fractional X positions for glyphs)
-
-#if WEBKIT_IMPLEMENTATION
-    // Translates the members of this struct to a FontRenderStyle
-    void toFontRenderStyle(WebCore::FontRenderStyle*);
-#endif
-
-    void setDefaults();
-};
-
-} // namespace WebKit
-
-#endif // WebFontRenderStyle_h
+#include "../../../../Platform/chromium/public/linux/WebFontRenderStyle.h"
diff --git a/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h b/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
index 70ad85228..a4e2397cd 100644
--- a/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
+++ b/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
@@ -49,8 +49,6 @@ namespace WebKit {
 class WebApplicationCacheHost; // FIXME: Does this belong in platform?
 class WebApplicationCacheHostClient; // FIXME: Does this belong in platform?
 class WebIDBFactory; // FIXME: Does this belong in platform?
-class WebIDBKey; // FIXME: Does this belong in platform?
-class WebIDBKeyPath; // FIXME: Does this belong in platform?
 class WebPluginListBuilder; // FIXME: Does this belong in platform?
 class WebSharedWorkerRepository; // FIXME: Does this belong in platform?
 
@@ -60,8 +58,6 @@ public:
     // Indexed Database ----------------------------------------------------
 
     virtual WebIDBFactory* idbFactory() { return 0; }
-    virtual void createIDBKeysFromSerializedValuesAndKeyPath(const WebVector<WebSerializedScriptValue>& values,  const WebIDBKeyPath& keyPath, WebVector<WebIDBKey>& keys) { }
-    virtual WebSerializedScriptValue injectIDBKeyIntoSerializedValue(const WebIDBKey& key, const WebSerializedScriptValue& value, const WebIDBKeyPath& keyPath) { return WebSerializedScriptValue(); }
 
 
     // Plugins -------------------------------------------------------------