diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/app/chrome.dll.deps | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/SConscript | 1 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 8 | ||||
| -rw-r--r-- | webkit/build/webkit_common_includes.vsprops | 2 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_lists/tests_fixable.txt | 11 |
6 files changed, 17 insertions, 8 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@7584", + "/trunk/deps/third_party/WebKit@7592", "src/third_party/icu38": "/trunk/deps/third_party/icu38@7525", diff --git a/chrome/app/chrome.dll.deps b/chrome/app/chrome.dll.deps index 5ff37e0..aa32be6 100644 --- a/chrome/app/chrome.dll.deps +++ b/chrome/app/chrome.dll.deps @@ -15,6 +15,7 @@ dependents = [ 'OLEAUT32.dll', 'OLEACC.dll', 'secur32.dll', + 't2embed.dll', ] delay_loaded = [ diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 7da40ad..94bdebd 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -897,6 +897,7 @@ if env.Bit('windows'): '$WEBCORE_DIR/platform/graphics/chromium/ThemeHelperChromiumWin.cpp', '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelper.cpp', '$WEBCORE_DIR/platform/graphics/chromium/UniscribeHelperTextRun.cpp', + '$WEBCORE_DIR/platform/graphics/opentype/OpenTypeUtilities.cpp', '$WEBCORE_DIR/platform/graphics/skia/SkiaFontWin.cpp', '$WEBCORE_DIR/rendering/RenderThemeChromiumWin.cpp', diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 2119867..3b94c30 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -1623,6 +1623,14 @@ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium\UniscribeHelperTextRun.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.h" + > + </File> </Filter> <Filter Name="skia" diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops index 6b8eed2..fe8229c 100644 --- a/webkit/build/webkit_common_includes.vsprops +++ b/webkit/build/webkit_common_includes.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";..\..\pending;..\..\port\bridge;"..\..\port\platform\image-decoders";"..\..\port\platform\image-decoders\bmp";"..\..\port\platform\image-decoders\gif";"..\..\port\platform\image-decoders\ico";"..\..\port\platform\image-decoders\jpeg";"..\..\port\platform\image-decoders\png";"..\..\port\platform\image-decoders\xbm";..\..\;"$(ProjectDir)";..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\page\chromium;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;"..\..\..\third_party\WebKit\WebCore\os-win32";..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;"..\..\..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite" + AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";..\..\pending;..\..\port\bridge;"..\..\port\platform\image-decoders";"..\..\port\platform\image-decoders\bmp";"..\..\port\platform\image-decoders\gif";"..\..\port\platform\image-decoders\ico";"..\..\port\platform\image-decoders\jpeg";"..\..\port\platform\image-decoders\png";"..\..\port\platform\image-decoders\xbm";..\..\;"$(ProjectDir)";..\..\..\third_party\WebKit\WebCore;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\page\chromium;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\platform\animation;..\..\..\third_party\WebKit\WebCore\platform\chromium;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\..\third_party\WebKit\WebCore\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\platform\graphics\opentype;..\..\..\third_party\WebKit\WebCore\platform\graphics\transforms;..\..\..\third_party\WebKit\WebCore\platform\graphics\skia;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\network\chromium;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;"..\..\..\third_party\WebKit\WebCore\os-win32";..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;"..\..\..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins;..\..\..\third_party\WebKit\WebCore\inspector;..\..\..\third_party\sqlite" /> </VisualStudioPropertySheet> diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt index 490d642..d78a624 100644 --- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt +++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt @@ -311,12 +311,11 @@ WIN : LayoutTests/fast/css/font-family-initial.html = FAIL WIN : LayoutTests/fast/css/font-face-default-font.html = FAIL WIN : LayoutTests/editing/pasteboard/drag-drop-dead-frame.html = FAIL -// Bug: 924387, 1058654 -// Broken until we fix our port to support remote TTF fonts and SVG Fonts -// GDI @font-face support has been implemented upstream, but we don't plan -// to fork to add support for @font-face for Beta. -// upstream: http://trac.webkit.org/projects/webkit/changeset/31507 -LINUX WIN : LayoutTests/fast/css/font-face-remote.html = FAIL +// Bug: 1303 +// Dynamic font support (@font-face) for Windows was ported from the +// upstream (http://trac.webkit.org/projects/webkit/changeset/31507) +// SVG test still fails, though. +LINUX : LayoutTests/fast/css/font-face-remote.html = FAIL WIN : LayoutTests/svg/custom/font-face-cascade-order.svg = FAIL // Bug: 1007391 |