Changeset 177512 in webkit


Ignore:
Timestamp:
Dec 18, 2014 11:56:46 AM (9 years ago)
Author:
Brent Fulgham
Message:

Source/WebKit:
[Win] Correct Windows tests after Bug 139149.
​https://bugs.webkit.org/show_bug.cgi?id=139781

Reviewed by Anders Carlsson.

  • WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Add new interface.
  • WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters: Ditto.
  • WebKit.vcxproj/WebKit/WebKit.vcxproj: Add new application cache object.
  • WebKit.vcxproj/WebKit/WebKit.vcxproj.filters: Ditto.

Source/WebKit/win:
[Win] Correct Windows tests after Bug 139149.
​https://bugs.webkit.org/show_bug.cgi?id=139781

Reviewed by Anders Carlsson.

  • Interfaces/IWebApplicationCache.idl: Added.
  • Interfaces/WebKit.idl: Add new IDL file.
  • WebActionPropertyBag.cpp:

(WebActionPropertyBag::Read): Remove old debugging message.

  • WebApplicationCache.cpp: Added.

(WebApplicationCache::WebApplicationCache):
(WebApplicationCache::~WebApplicationCache):
(WebApplicationCache::createInstance):
(WebApplicationCache::QueryInterface):
(WebApplicationCache::AddRef):
(WebApplicationCache::Release):
(WebApplicationCache::maximumSize):
(WebApplicationCache::setMaximumSize):
(WebApplicationCache::defaultOriginQuota):
(WebApplicationCache::setDefaultOriginQuota):
(WebApplicationCache::diskUsageForOrigin):
(WebApplicationCache::deleteAllApplicationCaches):
(WebApplicationCache::deleteCacheForOrigin):
(WebApplicationCache::originsWithCache):

  • WebApplicationCache.h: Added.
  • WebKitClassFactory.cpp: Add new interface header.

Tools:
[Win] Correct Windows tests after Bug 139149 (edit)
​https://bugs.webkit.org/show_bug.cgi?id=139781

Reviewed by Anders Carlsson.

  • DumpRenderTree/win/TestRunnerWin.cpp:

(TestRunner::clearAllApplicationCaches): Use new WebApplicationCache
interface.

Location:
trunk
Files:
3 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r177511 r177512  
     12014-12-18  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Correct Windows tests after Bug 139149.
     4        https://bugs.webkit.org/show_bug.cgi?id=139781
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Add new interface.
     9        * WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters: Ditto.
     10        * WebKit.vcxproj/WebKit/WebKit.vcxproj: Add new application cache object.
     11        * WebKit.vcxproj/WebKit/WebKit.vcxproj.filters: Ditto.
     12
    1132014-12-18  Andreas Kling  <akling@apple.com>
    214

  • trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj

    r176614 r177512  
    485485      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    486486    </Midl>
     487    <Midl Include="..\..\win\Interfaces\IWebApplicationCache.idl">
     488      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     489      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     490      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     491      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     492      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
     493      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
     494      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     495      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
     496    </Midl>
    487497    <Midl Include="..\..\win\Interfaces\IWebArchive.idl">
    488498      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

  • trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters

    r176614 r177512  
    277277    <Midl Include="..\..\win\Interfaces\Accessible2\AccessibleEditableText.idl">
    278278      <Filter>IDL\Accessibility2</Filter>
     279    </Midl>
     280    <Midl Include="..\..\win\Interfaces\IWebApplicationCache.idl">
     281      <Filter>IDL</Filter>
    279282    </Midl>
    280283  </ItemGroup>

  • trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj

    r177119 r177512  
    304304    <ClCompile Include="..\..\win\MemoryStream.cpp" />
    305305    <ClCompile Include="..\..\win\WebActionPropertyBag.cpp" />
     306    <ClCompile Include="..\..\win\WebApplicationCache.cpp" />
    306307    <ClCompile Include="..\..\win\WebArchive.cpp" />
    307308    <ClCompile Include="..\..\win\WebBackForwardList.cpp" />
    … …  
    442443    <ClInclude Include="..\..\win\ProgIDMacros.h" />
    443444    <ClInclude Include="..\..\win\WebActionPropertyBag.h" />
     445    <ClInclude Include="..\..\win\WebApplicationCache.h" />
    444446    <ClInclude Include="..\..\win\WebArchive.h" />
    445447    <ClInclude Include="..\..\win\WebBackForwardList.h" />

  • trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters

    r176913 r177512  
    273273      <Filter>WebCoreSupport</Filter>
    274274    </ClCompile>
     275    <ClCompile Include="..\..\win\WebCoreSupport\WebVisitedLinkStore.cpp" />
     276    <ClCompile Include="..\..\win\WebApplicationCache.cpp">
     277      <Filter>Sources</Filter>
     278    </ClCompile>
    275279  </ItemGroup>
    276280  <ItemGroup>
    … …  
    500504      <Filter>Header Files</Filter>
    501505    </ClInclude>
    502     <ClCompile Include="..\..\Storage\WebStorageNamespaceProvider.h">
    503       <Filter>Sources</Filter>
    504     </ClCompile>
    505506    <ClInclude Include="..\..\win\WebTextRenderer.h">
    506507      <Filter>Header Files</Filter>
    … …  
    536537    <ClInclude Include="..\..\win\WebCoreSupport\AcceleratedCompositingContext.h">
    537538      <Filter>WebCoreSupport</Filter>
     539    </ClInclude>
     540    <ClInclude Include="..\..\Storage\WebStorageNamespaceProvider.h">
     541      <Filter>Header Files</Filter>
     542    </ClInclude>
     543    <ClInclude Include="..\..\win\WebCoreSupport\WebVisitedLinkStore.h">
     544      <Filter>Header Files</Filter>
     545    </ClInclude>
     546    <ClInclude Include="..\..\win\WebApplicationCache.h">
     547      <Filter>Sources</Filter>
    538548    </ClInclude>
    539549  </ItemGroup>

  • trunk/Source/WebKit/win/ChangeLog

    r177482 r177512  
     12014-12-18  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Correct Windows tests after Bug 139149.
     4        https://bugs.webkit.org/show_bug.cgi?id=139781
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Interfaces/IWebApplicationCache.idl: Added.
     9        * Interfaces/WebKit.idl: Add new IDL file.
     10        * WebActionPropertyBag.cpp:
     11        (WebActionPropertyBag::Read): Remove old debugging message.
     12        * WebApplicationCache.cpp: Added.
     13        (WebApplicationCache::WebApplicationCache):
     14        (WebApplicationCache::~WebApplicationCache):
     15        (WebApplicationCache::createInstance):
     16        (WebApplicationCache::QueryInterface):
     17        (WebApplicationCache::AddRef):
     18        (WebApplicationCache::Release):
     19        (WebApplicationCache::maximumSize):
     20        (WebApplicationCache::setMaximumSize):
     21        (WebApplicationCache::defaultOriginQuota):
     22        (WebApplicationCache::setDefaultOriginQuota):
     23        (WebApplicationCache::diskUsageForOrigin):
     24        (WebApplicationCache::deleteAllApplicationCaches):
     25        (WebApplicationCache::deleteCacheForOrigin):
     26        (WebApplicationCache::originsWithCache):
     27        * WebApplicationCache.h: Added.
     28        * WebKitClassFactory.cpp: Add new interface header.
     29
    1302014-12-17  Anders Carlsson  <andersca@apple.com>
    231

  • trunk/Source/WebKit/win/Interfaces/WebKit.idl

    r176614 r177512  
    7171#include "DOMRange.idl"
    7272#include "DOMWindow.idl"
     73#include "IWebApplicationCache.idl"
    7374#include "IWebArchive.idl"
    7475#include "IWebBackForwardList.idl"
    … …  
    196197    }
    197198
     199    [uuid(1119E970-4b13-4b9a-a049-41096104b689)]
     200    coclass WebApplicationCache {
     201        [default] interface IWebApplicationCache;
     202    }
     203
    198204    [uuid(f71071fd-a51b-4b69-9eb6-44374405e80c)]
    199205    coclass WebCache {

  • trunk/Source/WebKit/win/WebActionPropertyBag.cpp

    r176892 r177512  
    111111        return E_POINTER;
    112112
    113     WTFLogAlways("pVar Pointer Value: %p", pVar);
    114113    VariantClear(pVar);
    115114

  • trunk/Source/WebKit/win/WebKitClassFactory.cpp

    r176892 r177512  
    11/*
    2  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2006, 2007, 2014 Apple Inc.  All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2929#include "CFDictionaryPropertyBag.h"
    3030#include "ForEachCoClass.h"
     31#include "WebApplicationCache.h"
    3132#include "WebArchive.h"
    3233#include "WebCache.h"

  • trunk/Tools/ChangeLog

    r177510 r177512  
     12014-12-18  Brent Fulgham  <bfulgham@apple.com>
     2
     3        [Win] Correct Windows tests after Bug 139149 (edit)
     4        https://bugs.webkit.org/show_bug.cgi?id=139781
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * DumpRenderTree/win/TestRunnerWin.cpp:
     9        (TestRunner::clearAllApplicationCaches): Use new WebApplicationCache
     10        interface.
     11
    1122014-12-18  Simon Fraser  <simon.fraser@apple.com>
    213

  • trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp

    r176698 r177512  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006-2014 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    751751void TestRunner::clearAllApplicationCaches()
    752752{
    753     // FIXME: Implement to support application cache quotas, and to make testing more reliable (see <https://bugs.webkit.org/show_bug.cgi?id=139149>).
     753    COMPtr<IWebApplicationCache> applicationCache;
     754    if (FAILED(WebKitCreateInstance(CLSID_WebApplicationCache, 0, IID_IWebApplicationCache, reinterpret_cast<void**>(&applicationCache))))
     755        return;
     756
     757    applicationCache->deleteAllApplicationCaches();
    754758}
    755759
Note: See TracChangeset for help on using the changeset viewer.