WebKit Merge 39143:39309, Part 8 (port side)

Review URL: http://codereview.chromium.org/14140

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7040 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 164 insertions, 46 deletions

diff --git a/DEPS b/DEPS
index a99d122..c8302a8 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@63",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@6957",
+    "/trunk/deps/third_party/WebKit@7039",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@6780",
@@ -21,13 +21,13 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@968",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39143",
+    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@39309",
 
   "src/third_party/WebKit/WebKit":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39143",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKit@39309",
 
   "src/third_party/WebKit/WebKitLibraries":
-    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39143",
+    "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@39309",
 }
 
 
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 2dd195b..a4ae5be 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@39143
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@39309
\ No newline at end of file
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index 86bf631..b0e3c80 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -398,8 +398,6 @@ input_files = [
 
     '$WEBCORE_DIR/platform/Arena.cpp',
     '$WEBCORE_DIR/platform/ContextMenu.cpp',
-    '$WEBCORE_DIR/platform/DeprecatedPtrListImpl.cpp',
-    '$WEBCORE_DIR/platform/DeprecatedValueListImpl.cpp',
     '$WEBCORE_DIR/platform/DragData.cpp',
     '$WEBCORE_DIR/platform/DragImage.cpp',
     '$WEBCORE_DIR/platform/FileChooser.cpp',
@@ -424,6 +422,7 @@ input_files = [
     '$WEBCORE_DIR/platform/graphics/FloatQuad.cpp',
     '$WEBCORE_DIR/platform/graphics/FloatRect.cpp',
     '$WEBCORE_DIR/platform/graphics/FloatSize.cpp',
+    '$WEBCORE_DIR/platform/graphics/FontFastPath.cpp',
     '$WEBCORE_DIR/platform/graphics/Font.cpp',
     '$WEBCORE_DIR/platform/graphics/FontData.cpp',
     '$WEBCORE_DIR/platform/graphics/FontFallbackList.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index c32d654..66b47b7 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -898,22 +898,6 @@
 				>

 			</File>

 			<File

-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\DeprecatedPtrQueue.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\DeprecatedValueList.h"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\DeprecatedValueListImpl.cpp"

-				>

-			</File>

-			<File

-				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\DeprecatedValueListImpl.h"

-				>

-			</File>

-			<File

 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\DragData.cpp"

 				>

 			</File>

@@ -946,6 +930,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\FontFastPath.cpp"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\Font.cpp"

 				>

 			</File>

diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index b985103..7d69ee1 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -123,6 +123,9 @@ public:
   virtual void enableSuddenTermination();
   virtual void disableSuddenTermination();
 
+  // TODO(brettw): Implement me!
+  virtual void formStateDidChange(const WebCore::Node*) { }
+
 private:
   WebViewImpl* webview_;  // weak pointer
   bool toolbars_visible_;
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 5996315..221f0e2 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -196,7 +196,7 @@ void WebPluginContainer::handleEvent(WebCore::Event* event) {
   impl_->handleEvent(event);
 }
 
-void WebPluginContainer::frameRectsChanged() const {
+void WebPluginContainer::frameRectsChanged() {
   WebCore::Widget::frameRectsChanged();
   // This is a hack to tickle re-positioning of the plugin in the case where
   // our parent view was scrolled.
diff --git a/webkit/glue/webplugin_impl.h b/webkit/glue/webplugin_impl.h
index 4ff1757..01cf7db 100644
--- a/webkit/glue/webplugin_impl.h
+++ b/webkit/glue/webplugin_impl.h
@@ -64,7 +64,7 @@ class WebPluginContainer : public WebCore::Widget {
   virtual void show();
   virtual void hide();
   virtual void handleEvent(WebCore::Event* event);
-  virtual void frameRectsChanged() const;
+  virtual void frameRectsChanged();
   virtual void setParentVisible(bool visible);
 
 #if USE(JSC)
diff --git a/webkit/port/bindings/v8/ScriptController.cpp b/webkit/port/bindings/v8/ScriptController.cpp
index 3127e4b..1e4ffe4 100644
--- a/webkit/port/bindings/v8/ScriptController.cpp
+++ b/webkit/port/bindings/v8/ScriptController.cpp
@@ -169,6 +169,16 @@ void ScriptController::clearScriptObjects()
 #endif
 }
 
+void ScriptController::updateSecurityOrigin()
+{
+    // TODO(dglazkov): Determine whether we need to do something here.
+}
+
+void ScriptController::updatePlatformScriptObjects()
+{
+    notImplemented();
+}
+
 void ScriptController::clearPluginObjects()
 {
     PluginObjectMap::iterator it = m_pluginObjects.begin();
diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h
index 5269a6a..e42ecfb 100644
--- a/webkit/port/bindings/v8/ScriptController.h
+++ b/webkit/port/bindings/v8/ScriptController.h
@@ -247,7 +247,9 @@ public:
     void clearWindowShell();
     void updateDocument();
 
+    void updateSecurityOrigin();
     void clearScriptObjects();
+    void updatePlatformScriptObjects();
     void cleanupScriptObjectsForPlugin(void*);
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
diff --git a/webkit/port/history/CachedPage.cpp b/webkit/port/history/CachedPage.cpp
index 8d1531d..cc26e7e 100644
--- a/webkit/port/history/CachedPage.cpp
+++ b/webkit/port/history/CachedPage.cpp
@@ -32,6 +32,7 @@
 #include "CachedPage.h"
 #include "Document.h"
 #include "DocumentLoader.h"
+#include "DOMWindow.h"
 #include "FrameView.h"
 #include "CachedPagePlatformData.h"
 
@@ -71,4 +72,6 @@ DocumentLoader* CachedPage::documentLoader() {
   return 0;
 }
 
+DOMWindow* CachedPage::domWindow() const { return 0; }
+
 }
diff --git a/webkit/port/platform/graphics/skia/BitmapImageSingleFrameSkia.h b/webkit/port/platform/graphics/skia/BitmapImageSingleFrameSkia.h
index 2ec3fbd..74ac230 100644
--- a/webkit/port/platform/graphics/skia/BitmapImageSingleFrameSkia.h
+++ b/webkit/port/platform/graphics/skia/BitmapImageSingleFrameSkia.h
@@ -33,7 +33,7 @@ public:
     }
 
     // Do nothing, as we only have the one representation of data (decoded).
-    virtual void destroyDecodedData(bool, bool preserveNearbyFrames = false) { }
+    virtual void destroyDecodedData(bool destroyAll = true) { }
 
     virtual unsigned decodedSize() const
     {
diff --git a/webkit/port/platform/graphics/skia/ImageSourceSkia.cpp b/webkit/port/platform/graphics/skia/ImageSourceSkia.cpp
index 95a335d..af5bb82 100644
--- a/webkit/port/platform/graphics/skia/ImageSourceSkia.cpp
+++ b/webkit/port/platform/graphics/skia/ImageSourceSkia.cpp
@@ -92,13 +92,19 @@ ImageSource::ImageSource()
 
 ImageSource::~ImageSource()
 {
-    clear();
+    clear(true);
 }
 
-void ImageSource::clear()
+void ImageSource::clear(bool destroyAll, size_t clearBeforeFrame)
 {
-    delete m_decoder;
-    m_decoder = 0;
+    if (destroyAll) {
+        delete m_decoder;
+        m_decoder = 0;
+        return;
+    }
+
+    if (m_decoder)
+        m_decoder->clearFrameBufferCache(clearBeforeFrame);
 }
 
 bool ImageSource::initialized() const
@@ -229,4 +235,10 @@ void ImageSourceSkia::setData(SharedBuffer* data,
     ImageSource::setData(data, allDataReceived);
 }
 
+String ImageSource::filenameExtension() const
+{
+    // TODO(pkasting): Implement me!
+    return String();
+}
+
 }
diff --git a/webkit/port/platform/image-decoders/ImageDecoder.h b/webkit/port/platform/image-decoders/ImageDecoder.h
index c4b6e20..f13c055 100644
--- a/webkit/port/platform/image-decoders/ImageDecoder.h
+++ b/webkit/port/platform/image-decoders/ImageDecoder.h
@@ -119,6 +119,14 @@ public:
         return *this;
     }
 
+    void clear() {
+      m_bitmapRef = RefCountedNativeImageSkia::create();
+      m_rect = IntRect();
+      m_status = FrameEmpty;
+      m_duration = 0;
+      m_disposalMethod = DisposeNotSpecified;
+    }
+
     // This function creates a new copy of the image data in |other|, so the
     // two images can be modified independently.
     void copyBitmapData(const RGBA32Buffer& other) {
@@ -257,6 +265,14 @@ public:
     bool failed() const { return m_failed; }
     void setFailed() { m_failed = true; }
 
+    // Wipe out frames in the frame buffer cache before |clearBeforeFrame|,
+    // assuming this can be done without breaking decoding.  Different decoders
+    // place different restrictions on what frames are safe to destroy, so this
+    // is left to them to implement.
+    // For convenience's sake, we provide a default (empty) implementation,
+    // since in practice only GIFs will ever use this.
+    virtual void clearFrameBufferCache(size_t clearBeforeFrame) { }
+
 protected:
     // Called by the image decoders to set their decoded size, this also check
     // the size for validity. It will return true if the size was set, or false
diff --git a/webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp b/webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp
index 678e080..6bc4133 100644
--- a/webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp
+++ b/webkit/port/platform/image-decoders/gif/GIFImageDecoder.cpp
@@ -157,9 +157,18 @@ int GIFImageDecoder::repetitionCount() const
     // packets sent back by the webserver) not always.  Our caller is
     // responsible for waiting until image decoding has finished to ask this if
     // it needs an authoritative answer.  In the meantime, we should default to
-    // "loop once", both in the reader and here.
-    if (m_reader)
-        m_repetitionCount = m_reader->repetitionCount();
+    // "loop once".
+    if (m_reader) {
+        // Added wrinkle: ImageSource::clear() may destroy the reader, making
+        // the result from the reader _less_ authoritative on future calls.  To
+        // detect this, the reader returns cLoopCountNotSeen (-2) instead of
+        // cAnimationLoopOnce (-1) when its current incarnation hasn't actually
+        // seen a loop count yet; in this case we return our previously-cached
+        // value.
+        const int repetitionCount = m_reader->repetitionCount();
+        if (repetitionCount != cLoopCountNotSeen)
+            m_repetitionCount = repetitionCount;
+    }
     return m_repetitionCount;
 }
 
@@ -175,6 +184,40 @@ RGBA32Buffer* GIFImageDecoder::frameBufferAtIndex(size_t index)
     return &frame;
 }
 
+void GIFImageDecoder::clearFrameBufferCache(size_t clearBeforeFrame)
+{
+    // In some cases, like if the decoder was destroyed while animating, we
+    // can be asked to clear more frames than we currently have.
+    if (m_frameBufferCache.isEmpty())
+        return;  // Nothing to do.
+    // The "-1" here is tricky.  It does not mean that |clearBeforeFrame| is the
+    // last frame we wish to preserve, but rather that we never want to clear
+    // the very last frame in the cache: it's empty (so clearing it is
+    // pointless), it's partial (so we don't want to clear it anyway), or the
+    // cache could be enlarged with a future setData() call and it could be
+    // needed to construct the next frame (see comments below).  Callers can
+    // always use ImageSource::clear(true, ...) to completely free the memory in
+    // this case.
+    clearBeforeFrame = std::min(clearBeforeFrame, m_frameBufferCache.size() - 1);
+    const Vector<RGBA32Buffer>::iterator end(m_frameBufferCache.begin() + clearBeforeFrame);
+    for (Vector<RGBA32Buffer>::iterator i(m_frameBufferCache.begin()); i != end; ++i) {
+        if (i->status() == RGBA32Buffer::FrameEmpty)
+            continue;  // Nothing to do.
+
+        // The layout of frames is:
+        // [empty frames][complete frames][partial frame][empty frames]
+        // ...where each of these groups may be empty.  We should not clear a
+        // partial frame since that's what's being decoded right now, and we
+        // also should not clear the last complete frame, since it may be needed
+        // when constructing the next frame.  Note that "i + 1" is safe since
+        // i < end < m_frameBufferCache.end().
+        if ((i->status() == RGBA32Buffer::FramePartial) || ((i + 1)->status() != RGBA32Buffer::FrameComplete))
+            break;
+
+        i->clear();
+    }
+}
+
 // Feed data to the GIF reader.
 void GIFImageDecoder::decode(GIFQuery query, unsigned haltAtFrame) const
 {
@@ -232,6 +275,7 @@ bool GIFImageDecoder::initFrameBuffer(unsigned frameIndex)
         // first frame specifies this method, it will get treated like
         // DisposeOverwriteBgcolor below and reset to a completely empty image.)
         const RGBA32Buffer* prevBuffer = &m_frameBufferCache[--frameIndex];
+        ASSERT(prevBuffer->status() == RGBA32Buffer::FrameComplete);
         RGBA32Buffer::FrameDisposalMethod prevMethod =
             prevBuffer->disposalMethod();
         while ((frameIndex > 0) &&
diff --git a/webkit/port/platform/image-decoders/gif/GIFImageDecoder.h b/webkit/port/platform/image-decoders/gif/GIFImageDecoder.h
index a93f7c1..a8b16df 100644
--- a/webkit/port/platform/image-decoders/gif/GIFImageDecoder.h
+++ b/webkit/port/platform/image-decoders/gif/GIFImageDecoder.h
@@ -54,6 +54,8 @@ public:
 
     virtual RGBA32Buffer* frameBufferAtIndex(size_t index);
 
+    virtual void clearFrameBufferCache(size_t clearBeforeFrame);
+
     virtual unsigned frameDurationAtIndex(size_t index) { return 0; }
 
     enum GIFQuery { GIFFullQuery, GIFSizeQuery, GIFFrameCountQuery };
diff --git a/webkit/port/platform/image-decoders/gif/GIFImageReader.h b/webkit/port/platform/image-decoders/gif/GIFImageReader.h
index c05c80b..09d15ea 100644
--- a/webkit/port/platform/image-decoders/gif/GIFImageReader.h
+++ b/webkit/port/platform/image-decoders/gif/GIFImageReader.h
@@ -47,6 +47,8 @@
 #define MAX_COLORS           256
 #define MAX_HOLD_SIZE        256
 
+const int cLoopCountNotSeen = -2;
+
 /* gif2.h  
    The interface for the GIF87/89a decoder. 
 */
@@ -187,7 +189,7 @@ struct GIFImageReader {
         screen_bgcolor = version = 0;
         screen_width = screen_height = 0;
         global_colormap_size = images_decoded = images_count = 0;
-        loop_count = -1;
+        loop_count = cLoopCountNotSeen;
         count = 0;
     }
 
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 1266453..4bb5812 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -657,7 +657,6 @@ LayoutTests/security/set-form-autocomplete-attribute.html = FAIL
 
 // Linux pixeltest failure: caret is in the wrong place
 LINUX WIN : LayoutTests/editing/selection/caret-rtl-2.html = FAIL
-LayoutTests/fast/backgrounds/svg-as-background-5.html = FAIL PASS
 LINUX WIN : LayoutTests/fast/block/float/float-avoidance.html = FAIL
 WIN : LayoutTests/fast/canvas/canvasDrawingIntoSelf.html = FAIL
 WIN : LayoutTests/fast/canvas/drawImage.html = FAIL
@@ -2025,4 +2024,46 @@ LINUX WIN : LayoutTests/svg/custom/use-nested-transform.svg = FAIL
 WIN : LayoutTests/svg/custom/container-opacity-clip-viewBox.svg = FAIL
 WIN : LayoutTests/svg/custom/image-parent-translation.xhtml = FAIL
 WIN : LayoutTests/svg/custom/pattern-cycle-detection.svg = FAIL
-WIN : LayoutTests/svg/custom/stroke-fallback.svg = FAIL 
+WIN : LayoutTests/svg/custom/stroke-fallback.svg = FAIL s
+
+// Merge 39143:39309
+LayoutTests/animations/animation-drt-api-multiple-keyframes.html = FAIL
+LayoutTests/animations/combo-transform-translate+scale.html = FAIL
+LayoutTests/animations/keyframes-from-missing.html = FAIL
+LayoutTests/animations/keyframes-rule.html = FAIL
+LayoutTests/animations/keyframes-to-missing.html = FAIL
+LayoutTests/fast/dom/object-embed-plugin-scripting.html = FAIL
+LayoutTests/fast/encoding/mailto-always-utf-8.html = FAIL
+LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html = FAIL
+LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html = FAIL
+LayoutTests/fast/forms/mailto/get-multiple-items.html = FAIL
+LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html = FAIL
+LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html = FAIL
+LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html = FAIL
+LayoutTests/fast/forms/mailto/get-non-ascii.html = FAIL
+LayoutTests/fast/forms/mailto/get-overwrite-query.html = FAIL
+LayoutTests/fast/forms/mailto/post-append-query.html = FAIL
+LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html = FAIL
+LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html = FAIL
+LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html = FAIL
+LayoutTests/fast/forms/mailto/post-multiple-items.html = FAIL
+LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html = FAIL
+LayoutTests/fast/forms/mailto/post-text-plain.html = FAIL
+LayoutTests/fast/js/regexp-no-extensions.html = FAIL
+LayoutTests/fast/regex/quantified-assertions.html = FAIL
+LayoutTests/http/tests/security/feed-urls-from-remote.html = FAIL
+LayoutTests/plugins/embed-attributes-setting.html = FAIL
+LayoutTests/transforms/2d/transform-value-types.html = FAIL
+LayoutTests/wml/go-task-animation.html = FAIL
+LayoutTests/animations/change-keyframes-name.html = TIMEOUT
+LayoutTests/fast/workers/worker-replace-self.html = TIMEOUT
+LayoutTests/http/tests/navigation/post-goback-repost-policy.html = TIMEOUT
+LayoutTests/fast/backgrounds/svg-as-background-5.html = CRASH FAIL PASS
+DEBUG : LayoutTests/editing/pasteboard/4947130.html = CRASH
+DEBUG : LayoutTests/editing/pasteboard/drag-image-in-about-blank-frame.html = CRASH
+DEBUG : LayoutTests/editing/pasteboard/drag-image-to-contenteditable-in-iframe.html = CRASH
+DEBUG : LayoutTests/editing/pasteboard/drag-selected-image-to-contenteditable.html = CRASH
+DEBUG : LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = CRASH
+DEBUG : LayoutTests/fast/events/standalone-image-drag-to-editable.html = CRASH
+// Missing expected results.
+SKIP : LayoutTests/svg/webarchive/svg-cursor-subresources.svg = FAIL
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 5174fb7..58a0d6f 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -44,6 +44,7 @@
 		419107560EF319C300BFDCC5 /* ScriptCallFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419107550EF319C300BFDCC5 /* ScriptCallFrame.cpp */; };
 		4191075F0EF319FC00BFDCC5 /* ScriptCallStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4191075E0EF319FC00BFDCC5 /* ScriptCallStack.cpp */; };
 		41AF32C60EE5E6ED00BF6361 /* ScriptInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41AF32C40EE5E6ED00BF6361 /* ScriptInstance.cpp */; };
+		41F1D4630EF70D1600DA8753 /* FontFastPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41F1D4620EF70D1600DA8753 /* FontFastPath.cpp */; };
 		4D11C5520E9AC23100EF7617 /* RenderThemeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = E49E50DE0E65E33200AD47F7 /* RenderThemeMac.mm */; };
 		4D1637CC0EBFA49E008F024E /* SQLiteAuthorizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D1637C30EBFA49E008F024E /* SQLiteAuthorizer.cpp */; };
 		4D1637CD0EBFA49E008F024E /* SQLiteDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4D1637C40EBFA49E008F024E /* SQLiteDatabase.cpp */; };
@@ -872,7 +873,6 @@
 		E45624B50E268E87005E4685 /* FileSystemCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F830D7F3CC1001ECF42 /* FileSystemCF.cpp */; };
 		E45624B70E268E87005E4685 /* ContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F860D7F3CC1001ECF42 /* ContextMenu.cpp */; };
 		E45624B90E268E87005E4685 /* DeprecatedPtrListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F900D7F3CC1001ECF42 /* DeprecatedPtrListImpl.cpp */; };
-		E45624BC0E268E87005E4685 /* DeprecatedValueListImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F980D7F3CC1001ECF42 /* DeprecatedValueListImpl.cpp */; };
 		E45624BD0E268E87005E4685 /* DragData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F9A0D7F3CC1001ECF42 /* DragData.cpp */; };
 		E45624BE0E268E87005E4685 /* DragImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F9C0D7F3CC1001ECF42 /* DragImage.cpp */; };
 		E45624BF0E268E87005E4685 /* FileChooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F9E0D7F3CC1001ECF42 /* FileChooser.cpp */; };
@@ -1454,6 +1454,7 @@
 		4191075E0EF319FC00BFDCC5 /* ScriptCallStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptCallStack.cpp; sourceTree = "<group>"; };
 		41AF32C40EE5E6ED00BF6361 /* ScriptInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptInstance.cpp; sourceTree = "<group>"; };
 		41AF32C50EE5E6ED00BF6361 /* ScriptInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptInstance.h; sourceTree = "<group>"; };
+		41F1D4620EF70D1600DA8753 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = "<group>"; };
 		4D1637C30EBFA49E008F024E /* SQLiteAuthorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteAuthorizer.cpp; sourceTree = "<group>"; };
 		4D1637C40EBFA49E008F024E /* SQLiteDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteDatabase.cpp; sourceTree = "<group>"; };
 		4D1637C50EBFA49E008F024E /* SQLiteDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLiteDatabase.h; sourceTree = "<group>"; };
@@ -3009,10 +3010,6 @@
 		7B5E8F8F0D7F3CC1001ECF42 /* DeprecatedPtrList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrList.h; sourceTree = "<group>"; };
 		7B5E8F900D7F3CC1001ECF42 /* DeprecatedPtrListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedPtrListImpl.cpp; sourceTree = "<group>"; };
 		7B5E8F910D7F3CC1001ECF42 /* DeprecatedPtrListImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrListImpl.h; sourceTree = "<group>"; };
-		7B5E8F920D7F3CC1001ECF42 /* DeprecatedPtrQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedPtrQueue.h; sourceTree = "<group>"; };
-		7B5E8F970D7F3CC1001ECF42 /* DeprecatedValueList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueList.h; sourceTree = "<group>"; };
-		7B5E8F980D7F3CC1001ECF42 /* DeprecatedValueListImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedValueListImpl.cpp; sourceTree = "<group>"; };
-		7B5E8F990D7F3CC1001ECF42 /* DeprecatedValueListImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeprecatedValueListImpl.h; sourceTree = "<group>"; };
 		7B5E8F9A0D7F3CC1001ECF42 /* DragData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DragData.cpp; sourceTree = "<group>"; };
 		7B5E8F9B0D7F3CC1001ECF42 /* DragData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DragData.h; sourceTree = "<group>"; };
 		7B5E8F9C0D7F3CC1001ECF42 /* DragImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DragImage.cpp; sourceTree = "<group>"; };
@@ -5624,10 +5621,6 @@
 				7B5E8F8F0D7F3CC1001ECF42 /* DeprecatedPtrList.h */,
 				7B5E8F900D7F3CC1001ECF42 /* DeprecatedPtrListImpl.cpp */,
 				7B5E8F910D7F3CC1001ECF42 /* DeprecatedPtrListImpl.h */,
-				7B5E8F920D7F3CC1001ECF42 /* DeprecatedPtrQueue.h */,
-				7B5E8F970D7F3CC1001ECF42 /* DeprecatedValueList.h */,
-				7B5E8F980D7F3CC1001ECF42 /* DeprecatedValueListImpl.cpp */,
-				7B5E8F990D7F3CC1001ECF42 /* DeprecatedValueListImpl.h */,
 				7B5E8F9A0D7F3CC1001ECF42 /* DragData.cpp */,
 				7B5E8F9B0D7F3CC1001ECF42 /* DragData.h */,
 				7B5E8F9C0D7F3CC1001ECF42 /* DragImage.cpp */,
@@ -5735,6 +5728,7 @@
 				7B5E8FD60D7F3CC1001ECF42 /* FontFallbackList.h */,
 				7B5E8FD70D7F3CC1001ECF42 /* FontFamily.cpp */,
 				7B5E8FD80D7F3CC1001ECF42 /* FontFamily.h */,
+				41F1D4620EF70D1600DA8753 /* FontFastPath.cpp */,
 				4DB7EFFC0E9BA3A100C66CE0 /* FontRenderingMode.h */,
 				7B5E8FD90D7F3CC1001ECF42 /* FontSelector.h */,
 				4DB7EFFD0E9BA3A100C66CE0 /* FontTraitsMask.h */,
@@ -8477,6 +8471,8 @@
 				7B0095C90DAFF00200F72082 /* XLinkNames.cpp in Sources */,
 				7B0095CB0DAFF00200F72082 /* XMLNames.cpp in Sources */,
 				7B0095CD0DAFF00200F72082 /* XPathGrammar.cpp in Sources */,
+				419107560EF319C300BFDCC5 /* ScriptCallFrame.cpp in Sources */,
+				4191075F0EF319FC00BFDCC5 /* ScriptCallStack.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -8620,7 +8616,6 @@
 				E45623F30E268E87005E4685 /* DeleteFromTextNodeCommand.cpp in Sources */,
 				E45623F40E268E87005E4685 /* DeleteSelectionCommand.cpp in Sources */,
 				E45624B90E268E87005E4685 /* DeprecatedPtrListImpl.cpp in Sources */,
-				E45624BC0E268E87005E4685 /* DeprecatedValueListImpl.cpp in Sources */,
 				E45624840E268E87005E4685 /* DocLoader.cpp in Sources */,
 				E45623BA0E268E87005E4685 /* Document.cpp in Sources */,
 				E45623BB0E268E87005E4685 /* DocumentFragment.cpp in Sources */,
@@ -8673,6 +8668,7 @@
 				E45624CA0E268E87005E4685 /* FontFallbackList.cpp in Sources */,
 				E45624CB0E268E87005E4685 /* FontFamily.cpp in Sources */,
 				E456239D0E268E87005E4685 /* FontFamilyValue.cpp in Sources */,
+				41F1D4630EF70D1600DA8753 /* FontFastPath.cpp in Sources */,
 				E45624D80E268E87005E4685 /* FontMac.mm in Sources */,
 				ABBD24DA0EB7C29F00BEC658 /* FontMacATSUI.mm in Sources */,
 				ABBD24DB0EB7C29F00BEC658 /* FontMacCoreText.cpp in Sources */,