diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKit/win/Interfaces/WebKit.idl | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKit/win/Interfaces/WebKit.idl')
| -rw-r--r-- | WebKit/win/Interfaces/WebKit.idl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl index 0de6b0b..d25cdfe 100644 --- a/WebKit/win/Interfaces/WebKit.idl +++ b/WebKit/win/Interfaces/WebKit.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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, 2010 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") @@ -134,6 +134,7 @@ import "ocidl.idl"; #include "IWebURLResponsePrivate.idl" #include "IWebUndoManager.idl" #include "IWebUndoTarget.idl" +#include "IWebUserContentURLPattern.idl" #include "IWebView.idl" #include "IWebViewPrivate.idl" #include "IWebWorkersPrivate.idl" @@ -293,4 +294,9 @@ library WebKit coclass WebGeolocationPosition { [default] interface IWebGeolocationPosition; } + + [uuid(2D62AE25-DEAA-4945-A76E-CCE05E899664)] + coclass WebUserContentURLPattern { + [default] interface IWebUserContentURLPattern; + } } |