diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebKit/win/Interfaces/WebKit.idl | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebKit/win/Interfaces/WebKit.idl')
| -rw-r--r-- | WebKit/win/Interfaces/WebKit.idl | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl index cdd24b3..7b308db 100644 --- a/WebKit/win/Interfaces/WebKit.idl +++ b/WebKit/win/Interfaces/WebKit.idl @@ -24,7 +24,7 @@ */ cpp_quote("/*") -cpp_quote(" * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.") +cpp_quote(" * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.") cpp_quote(" *") cpp_quote(" * Redistribution and use in source and binary forms, with or without") cpp_quote(" * modification, are permitted provided that the following conditions") @@ -56,6 +56,7 @@ import "oaidl.idl"; import "ocidl.idl"; #include "WebScrollbarTypes.idl" +#include "JavaScriptCoreAPITypes.idl" #include "IWebScriptObject.idl" #include "DOMCSS.idl" #include "DOMCore.idl" @@ -113,9 +114,11 @@ import "ocidl.idl"; #include "IWebResource.idl" #include "IWebResourceLoadDelegate.idl" #include "IWebResourceLoadDelegatePrivate.idl" +#include "IWebScriptWorld.idl" #include "IWebScrollBarDelegatePrivate.idl" #include "IWebScrollBarPrivate.idl" #include "IWebSecurityOrigin.idl" +#include "IWebSerializedJSValue.idl" #include "IWebTextRenderer.idl" #include "IWebUIDelegate.idl" #include "IWebUIDelegate2.idl" @@ -271,4 +274,14 @@ library WebKit coclass WebWorkersPrivate{ [default] interface IWebWorkersPrivate; } + + [uuid(D3C301EE-D59A-49c0-A43A-9EA01CDB1590)] + coclass WebScriptWorld { + [default] interface IWebScriptWorld; + } + + [uuid(13C45703-A3B3-8797-276B-75632F6165C3)] + coclass WebSerializedJSValue { + [default] interface IWebSerializedJSValue; + } } |