diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/api/src/WebKit.cpp | 4 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 10 |
3 files changed, 10 insertions, 6 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "44646", + "webkit_revision": "44668", } diff --git a/webkit/api/src/WebKit.cpp b/webkit/api/src/WebKit.cpp index 163a3a3..8ecc859 100644 --- a/webkit/api/src/WebKit.cpp +++ b/webkit/api/src/WebKit.cpp @@ -87,12 +87,12 @@ bool layoutTestMode() void registerURLSchemeAsLocal(const WebString& scheme) { - WebCore::FrameLoader::registerURLSchemeAsLocal(scheme); + WebCore::SecurityOrigin::registerURLSchemeAsLocal(scheme); } void registerURLSchemeAsNoAccess(const WebString& scheme) { - WebCore::FrameLoader::registerURLSchemeAsNoAccess(scheme); + WebCore::SecurityOrigin::registerURLSchemeAsNoAccess(scheme); } void registerExtension(v8::Extension* extension) diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index d489504..3e8df1e 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -53,6 +53,7 @@ '../third_party/WebKit/WebCore/platform/graphics/opentype', '../third_party/WebKit/WebCore/platform/graphics/skia', '../third_party/WebKit/WebCore/platform/graphics/transforms', + '../third_party/WebKit/WebCore/platform/image-decoders', '../third_party/WebKit/WebCore/platform/image-decoders/bmp', '../third_party/WebKit/WebCore/platform/image-decoders/gif', '../third_party/WebKit/WebCore/platform/image-decoders/ico', @@ -1019,6 +1020,8 @@ '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h', '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomVoidCallback.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomVoidCallback.h', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomXPathNSResolver.cpp', + '../third_party/WebKit/WebCore/bindings/v8/custom/V8CustomXPathNSResolver.h', '../third_party/WebKit/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8DocumentLocationCustom.cpp', '../third_party/WebKit/WebCore/bindings/v8/custom/V8DOMParserConstructor.cpp', @@ -2540,6 +2543,7 @@ '../third_party/WebKit/WebCore/platform/gtk/WidgetGtk.cpp', '../third_party/WebKit/WebCore/platform/gtk/gtkdrawing.h', '../third_party/WebKit/WebCore/platform/gtk/guriescape.h', + '../third_party/WebKit/WebCore/platform/image-decoders/ImageDecoder.h', '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp', '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h', '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp', @@ -2554,7 +2558,6 @@ '../third_party/WebKit/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h', '../third_party/WebKit/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp', '../third_party/WebKit/WebCore/platform/image-decoders/png/PNGImageDecoder.h', - '../third_party/WebKit/WebCore/platform/image-decoders/skia/ImageDecoder.h', '../third_party/WebKit/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp', '../third_party/WebKit/WebCore/platform/image-decoders/xbm/XBMImageDecoder.h', '../third_party/WebKit/WebCore/platform/image-decoders/zlib/crc32.h', @@ -2568,7 +2571,7 @@ '../third_party/WebKit/WebCore/platform/image-decoders/zlib/zconf.h', '../third_party/WebKit/WebCore/platform/image-decoders/zlib/zlib.h', '../third_party/WebKit/WebCore/platform/image-decoders/zlib/zutil.h', - '../third_party/WebKit/WebCore/platform/image-decoders/ImageDecoder.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp', '../third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp', '../third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.h', '../third_party/WebKit/WebCore/platform/mac/AutodrainedPool.mm', @@ -4097,6 +4100,7 @@ # Skia image-decoders are also not used on mac. CoreGraphics # is used directly instead. + '../third_party/WebKit/WebCore/platform/image-decoders/ImageDecoder.h', '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp', '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h', '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp', @@ -4111,7 +4115,7 @@ '../third_party/WebKit/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h', '../third_party/WebKit/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp', '../third_party/WebKit/WebCore/platform/image-decoders/png/PNGImageDecoder.h', - '../third_party/WebKit/WebCore/platform/image-decoders/skia/ImageDecoder.h', + '../third_party/WebKit/WebCore/platform/image-decoders/skia/ImageDecoderSkia.cpp', '../third_party/WebKit/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp', '../third_party/WebKit/WebCore/platform/image-decoders/xbm/XBMImageDecoder.h', ], |