| Index: ppapi/thunk/ppb_url_util_thunk.cc
|
| ===================================================================
|
| --- ppapi/thunk/ppb_url_util_thunk.cc (revision 113301)
|
| +++ ppapi/thunk/ppb_url_util_thunk.cc (working copy)
|
| @@ -3,7 +3,7 @@
|
| // found in the LICENSE file.
|
|
|
| #include "ppapi/c/pp_errors.h"
|
| -#include "ppapi/shared_impl/ppb_url_util_shared.h"
|
| +#include "ppapi/shared_impl/url_util_impl.h"
|
| #include "ppapi/thunk/enter.h"
|
| #include "ppapi/thunk/ppb_instance_api.h"
|
| #include "ppapi/thunk/thunk.h"
|
| @@ -54,10 +54,10 @@
|
| }
|
|
|
| const PPB_URLUtil_Dev g_ppb_url_util = {
|
| - &PPB_URLUtil_Shared::Canonicalize,
|
| - &PPB_URLUtil_Shared::ResolveRelativeToURL,
|
| + &URLUtilImpl::Canonicalize,
|
| + &URLUtilImpl::ResolveRelativeToURL,
|
| &ResolveRelativeToDocument,
|
| - &PPB_URLUtil_Shared::IsSameSecurityOrigin,
|
| + &URLUtilImpl::IsSameSecurityOrigin,
|
| &DocumentCanRequest,
|
| &DocumentCanAccessDocument,
|
| &GetDocumentURL,
|
|
|
| Property changes on: ppapi/thunk/ppb_url_util_thunk.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|