Show
Ignore:
Timestamp:
08/04/08 12:23:14 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35534

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/WebKit/win/COMPropertyBag.h

    r427 r429  
    101101    *ppvObject = 0; 
    102102    if (IsEqualGUID(riid, IID_IUnknown)) 
    103         *ppvObject = static_cast<COMPropertyBag*>(this); 
     103        *ppvObject = static_cast<IPropertyBag*>(this); 
    104104    else if (IsEqualGUID(riid, IID_IPropertyBag)) 
    105         *ppvObject = static_cast<COMPropertyBag*>(this); 
     105        *ppvObject = static_cast<IPropertyBag*>(this); 
    106106    else if (IsEqualGUID(riid, IID_IPropertyBag2)) 
    107         *ppvObject = static_cast<COMPropertyBag*>(this); 
     107        *ppvObject = static_cast<IPropertyBag2*>(this); 
    108108    else 
    109109        return E_NOINTERFACE;