Changeset 128296 in webkit
- Timestamp:
- Sep 12, 2012 5:15:32 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r128293 r128296 1 2012-09-12 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r128280. 4 http://trac.webkit.org/changeset/128280 5 https://bugs.webkit.org/show_bug.cgi?id=96498 6 7 it broke compilation on windows debug bot (Requested by loislo 8 on #webkit). 9 10 * platform/efl-wk1/TestExpectations: 11 * platform/efl/Skipped: 12 * platform/wk2/Skipped: 13 1 14 2012-09-12 Andrei Poenaru <poenaru@adobe.com> 2 15 -
trunk/LayoutTests/platform/efl-wk1/TestExpectations
r128280 r128296 48 48 BUGWK87355 : canvas/philip/tests/2d.text.draw.fontface.notinpage.html = TEXT 49 49 50 // EFL's TestRunner does not implement applicationCacheDiskUsageForOrigin51 BUGWK86460 : http/tests/appcache/origin-usage.html = TEXT52 53 // EFL's TestRunner does not implement originsWithApplicationCache54 BUGWK86498 : http/tests/appcache/origins-with-appcache.html = TEXT55 56 50 // Missing showModalDialog implementation 57 51 BUGWK84589 : fast/animation/request-animation-frame-during-modal.html = TEXT -
trunk/LayoutTests/platform/efl/Skipped
r128280 r128296 103 103 # Fallback resource wasn't used for a redirect to a resource with another origin 104 104 http/tests/appcache/fallback.html 105 106 # EFL's LayoutTestController does not implement applicationCacheDiskUsageForOrigin 107 http/tests/appcache/origin-usage.html 108 109 # EFL's LayoutTestController does not implement originsWithApplicationCache 110 http/tests/appcache/origins-with-appcache.html 105 111 106 112 # EFL's LayoutTestController does not implement shadowPseudoId -
trunk/LayoutTests/platform/wk2/Skipped
r128280 r128296 203 203 fast/text/zero-font-size.html 204 204 205 # WTR needs an implementation of originsWithApplicationCache 205 # WTR needs an implementation of dumpApplicationCacheDelegateCallbacks 206 http/tests/appcache/origin-delete.html 207 http/tests/appcache/origin-quota.html 208 http/tests/appcache/origin-quota-continued-download.html 209 http/tests/appcache/origin-quota-continued-download-multiple-manifests.html 210 http/tests/appcache/origin-usage.html 206 211 http/tests/appcache/origins-with-appcache.html 207 212 -
trunk/Source/WebKit2/ChangeLog
r128289 r128296 1 2012-09-12 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r128280. 4 http://trac.webkit.org/changeset/128280 5 https://bugs.webkit.org/show_bug.cgi?id=96498 6 7 it broke compilation on windows debug bot (Requested by loislo 8 on #webkit). 9 10 * Shared/APIClientTraits.cpp: 11 (WebKit): 12 * Shared/APIClientTraits.h: 13 * WebProcess/InjectedBundle/API/c/WKBundle.cpp: 14 (WKBundleSetApplicationCacheOriginQuota): 15 * WebProcess/InjectedBundle/API/c/WKBundlePage.h: 16 * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: 17 * WebProcess/InjectedBundle/InjectedBundle.cpp: 18 * WebProcess/InjectedBundle/InjectedBundle.h: 19 (InjectedBundle): 20 * WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp: 21 * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h: 22 (WebKit): 23 (InjectedBundlePageUIClient): 24 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 25 (WebKit::WebChromeClient::reachedApplicationCacheOriginQuota): 26 1 27 2012-09-12 Byungwoo Lee <bw80.lee@samsung.com> 2 28 -
trunk/Source/WebKit2/Shared/APIClientTraits.cpp
r128280 r128296 76 76 }; 77 77 78 const size_t APIClientTraits<WKBundlePageUIClient>::interfaceSizesByVersion[] = {79 offsetof(WKBundlePageUIClient, didReachApplicationCacheOriginQuota),80 sizeof(WKBundlePageUIClient)81 };82 83 78 const size_t APIClientTraits<WKContextInjectedBundleClient>::interfaceSizesByVersion[] = { 84 79 offsetof(WKContextInjectedBundleClient, getInjectedBundleInitializationUserData), -
trunk/Source/WebKit2/Shared/APIClientTraits.h
r128280 r128296 55 55 }; 56 56 57 template<> struct APIClientTraits<WKBundlePageUIClient> {58 static const size_t interfaceSizesByVersion[2];59 };60 61 57 template<> struct APIClientTraits<WKPageContextMenuClient> { 62 58 static const size_t interfaceSizesByVersion[3]; -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
r128280 r128296 249 249 void WKBundleSetApplicationCacheOriginQuota(WKBundleRef bundleRef, WKStringRef origin, uint64_t bytes) 250 250 { 251 toImpl(bundleRef)->setApplicationCacheOriginQuota(toImpl(origin)->string(), bytes); 252 } 253 254 void WKBundleResetApplicationCacheOriginQuota(WKBundleRef bundleRef, WKStringRef origin) 255 { 256 toImpl(bundleRef)->resetApplicationCacheOriginQuota(toImpl(origin)->string()); 251 return toImpl(bundleRef)->setApplicationCacheOriginQuota(toImpl(origin)->string(), bytes); 257 252 } 258 253 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
r128280 r128296 237 237 typedef WKBundlePageUIElementVisibility (*WKBundlePageMenuBarIsVisibleCallback)(WKBundlePageRef page, const void *clientInfo); 238 238 typedef WKBundlePageUIElementVisibility (*WKBundlePageToolbarsAreVisibleCallback)(WKBundlePageRef page, const void *clientInfo); 239 typedef void (*WKBundlePageReachedAppCacheOriginQuotaCallback)(WKBundlePageRef page, WKSecurityOriginRef origin, int64_t totalBytesNeeded, const void *clientInfo);240 239 241 240 struct WKBundlePageUIClient { … … 256 255 WKBundlePageMenuBarIsVisibleCallback menuBarIsVisible; 257 256 WKBundlePageToolbarsAreVisibleCallback toolbarsAreVisible; 258 259 // Version 1.260 WKBundlePageReachedAppCacheOriginQuotaCallback didReachApplicationCacheOriginQuota;261 257 }; 262 258 typedef struct WKBundlePageUIClient WKBundlePageUIClient; 263 259 264 enum { kWKBundlePageUIClientCurrentVersion = 1};260 enum { kWKBundlePageUIClientCurrentVersion = 0 }; 265 261 266 262 // Editor client -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h
r128280 r128296 100 100 WK_EXPORT uint64_t WKBundleGetAppCacheUsageForOrigin(WKBundleRef bundle, WKStringRef origin); 101 101 WK_EXPORT void WKBundleSetApplicationCacheOriginQuota(WKBundleRef bundle, WKStringRef origin, uint64_t bytes); 102 WK_EXPORT void WKBundleResetApplicationCacheOriginQuota(WKBundleRef bundle, WKStringRef origin);103 102 104 103 // Garbage collection API -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r128280 r128296 360 360 } 361 361 362 void InjectedBundle::resetApplicationCacheOriginQuota(const String& originString)363 {364 RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString(originString);365 cacheStorage().storeUpdatedQuotaForOrigin(origin.get(), cacheStorage().defaultOriginQuota());366 }367 368 362 int InjectedBundle::numberOfPages(WebFrame* frame, double pageWidthInPixels, double pageHeightInPixels) 369 363 { -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r128280 r128296 151 151 uint64_t appCacheUsageForOrigin(const String& origin); 152 152 void setApplicationCacheOriginQuota(const String& origin, uint64_t); 153 void resetApplicationCacheOriginQuota(const String& origin);154 153 155 154 // Garbage collection API -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp
r128280 r128296 29 29 #include "InjectedBundleHitTestResult.h" 30 30 #include "WKAPICast.h" 31 #include "WebGraphicsContext.h" 31 32 #include "WKBundleAPICast.h" 32 #include "WebGraphicsContext.h"33 #include "WebSecurityOrigin.h"34 33 #include <wtf/text/WTFString.h> 35 34 … … 148 147 } 149 148 150 void InjectedBundlePageUIClient::didReachApplicationCacheOriginQuota(WebPage* page, WebSecurityOrigin* origin, int64_t totalBytesNeeded)151 {152 if (!m_client.didReachApplicationCacheOriginQuota)153 return;154 155 m_client.didReachApplicationCacheOriginQuota(toAPI(page), toAPI(origin), totalBytesNeeded, m_client.clientInfo);156 }157 158 149 } // namespace WebKit -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h
r128280 r128296 43 43 class WebFrame; 44 44 class WebPage; 45 class WebSecurityOrigin;46 45 47 46 class InjectedBundlePageUIClient : public APIClient<WKBundlePageUIClient, kWKBundlePageUIClientCurrentVersion> { … … 66 65 WKBundlePageUIElementVisibility menuBarIsVisible(WebPage*); 67 66 WKBundlePageUIElementVisibility toolbarsAreVisible(WebPage*); 68 69 void didReachApplicationCacheOriginQuota(WebPage*, WebSecurityOrigin*, int64_t totalBytesNeeded);70 67 }; 71 68 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r128280 r128296 46 46 #include "WebProcess.h" 47 47 #include "WebSearchPopupMenu.h" 48 #include "WebSecurityOrigin.h"49 48 #include <WebCore/AXObjectCache.h> 50 49 #include <WebCore/ColorChooser.h> … … 551 550 } 552 551 553 void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin* origin, int64_t totalBytesNeeded) 554 { 555 RefPtr<WebSecurityOrigin> webSecurityOrigin = WebSecurityOrigin::createFromString(origin->toString()); 556 m_page->injectedBundleUIClient().didReachApplicationCacheOriginQuota(m_page, webSecurityOrigin.get(), totalBytesNeeded); 552 void WebChromeClient::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t) 553 { 554 notImplemented(); 557 555 } 558 556 -
trunk/Tools/ChangeLog
r128295 r128296 1 2012-09-12 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r128280. 4 http://trac.webkit.org/changeset/128280 5 https://bugs.webkit.org/show_bug.cgi?id=96498 6 7 it broke compilation on windows debug bot (Requested by loislo 8 on #webkit). 9 10 * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl: 11 * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: 12 (WTR::InjectedBundlePage::InjectedBundlePage): 13 * WebKitTestRunner/InjectedBundle/InjectedBundlePage.h: 14 (InjectedBundlePage): 15 * WebKitTestRunner/InjectedBundle/TestRunner.cpp: 16 (WTR::TestRunner::TestRunner): 17 * WebKitTestRunner/InjectedBundle/TestRunner.h: 18 (TestRunner): 19 1 20 2012-09-12 Simon Hausmann <simon.hausmann@nokia.com> 2 21 -
trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
r128280 r128296 48 48 void dumpResourceResponseMIMETypes(); 49 49 void dumpWillCacheResponse(); 50 void dumpApplicationCacheDelegateCallbacks();51 50 52 51 // Special options. … … 115 114 void clearApplicationCacheForOrigin(in DOMString name); 116 115 void setApplicationCacheOriginQuota(in unsigned long long bytes); 117 void disallowIncreaseForApplicationCacheQuota();118 116 119 117 // Compositing testing. -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
r128280 r128296 42 42 #include <WebKit2/WKBundleNodeHandlePrivate.h> 43 43 #include <WebKit2/WKBundlePagePrivate.h> 44 #include <WebKit2/WKBundlePrivate.h>45 #include <WebKit2/WKSecurityOrigin.h>46 44 #include <WebKit2/WKURLRequest.h> 47 45 #include <wtf/HashMap.h> … … 352 350 0, /*menuBarIsVisible*/ 353 351 0, /*toolbarsAreVisible*/ 354 didReachApplicationCacheOriginQuota,355 352 }; 356 353 WKBundlePageSetUIClient(m_page, &uiClient); … … 1322 1319 } 1323 1320 1324 void InjectedBundlePage::didReachApplicationCacheOriginQuota(WKBundlePageRef page, WKSecurityOriginRef origin, int64_t totalBytesNeeded, const void* clientInfo)1325 {1326 static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didReachApplicationCacheOriginQuota(origin, totalBytesNeeded);1327 }1328 1329 1321 static WTF::String lastFileURLPathComponent(const WTF::String& path) 1330 1322 { … … 1409 1401 InjectedBundle::shared().stringBuilder()->append(toWTFString(defaultValue)); 1410 1402 InjectedBundle::shared().stringBuilder()->append("\n"); 1411 }1412 1413 void InjectedBundlePage::didReachApplicationCacheOriginQuota(WKSecurityOriginRef origin, int64_t totalBytesNeeded)1414 {1415 if (!InjectedBundle::shared().testRunner()->shouldDumpApplicationCacheDelegateCallbacks())1416 return;1417 1418 // For example, numbers from 30000 - 39999 will output as 30000.1419 // Rounding up or down does not really matter for these tests. It's1420 // sufficient to just get a range of 10000 to determine if we were1421 // above or below a threshold.1422 int64_t truncatedSpaceNeeded = (totalBytesNeeded / 10000) * 10000;1423 1424 InjectedBundle::shared().stringBuilder()->appendLiteral("UI DELEGATE APPLICATION CACHE CALLBACK: exceededApplicationCacheOriginQuotaForSecurityOrigin:{");1425 InjectedBundle::shared().stringBuilder()->append(toWTFString(adoptWK(WKSecurityOriginCopyProtocol(origin))));1426 InjectedBundle::shared().stringBuilder()->appendLiteral(", ");1427 InjectedBundle::shared().stringBuilder()->append(toWTFString(adoptWK(WKSecurityOriginCopyHost(origin))));1428 InjectedBundle::shared().stringBuilder()->appendLiteral(", ");1429 InjectedBundle::shared().stringBuilder()->append(WTF::String::number(WKSecurityOriginGetPort(origin)));1430 InjectedBundle::shared().stringBuilder()->appendLiteral("} totalSpaceNeeded:~");1431 InjectedBundle::shared().stringBuilder()->append(WTF::String::number(truncatedSpaceNeeded));1432 InjectedBundle::shared().stringBuilder()->append('\n');1433 1434 if (InjectedBundle::shared().testRunner()->shouldDisallowIncreaseForApplicationCacheQuota())1435 return;1436 1437 // Reset default application cache quota.1438 WKBundleResetApplicationCacheOriginQuota(InjectedBundle::shared().bundle(), adoptWK(WKSecurityOriginCopyToString(origin)).get());1439 1403 } 1440 1404 -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.h
r128280 r128296 125 125 static void willRunJavaScriptConfirm(WKBundlePageRef, WKStringRef message, WKBundleFrameRef frame, const void* clientInfo); 126 126 static void willRunJavaScriptPrompt(WKBundlePageRef, WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef frame, const void* clientInfo); 127 static void didReachApplicationCacheOriginQuota(WKBundlePageRef, WKSecurityOriginRef, int64_t totalBytesNeeded, const void* clientInfo);128 127 void willAddMessageToConsole(WKStringRef message, uint32_t lineNumber); 129 128 void willSetStatusbarText(WKStringRef statusbarText); … … 131 130 void willRunJavaScriptConfirm(WKStringRef message, WKBundleFrameRef); 132 131 void willRunJavaScriptPrompt(WKStringRef message, WKStringRef defaultValue, WKBundleFrameRef); 133 void didReachApplicationCacheOriginQuota(WKSecurityOriginRef, int64_t totalBytesNeeded);134 132 135 133 #if ENABLE(FULLSCREEN_API) -
trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
r128280 r128296 81 81 , m_dumpResourceResponseMIMETypes(false) 82 82 , m_dumpWillCacheResponse(false) 83 , m_dumpApplicationCacheDelegateCallbacks(false)84 , m_disallowIncreaseForApplicationCacheQuota(false)85 83 , m_waitToDump(false) 86 84 , m_testRepaint(false) … … 326 324 } 327 325 328 void TestRunner::disallowIncreaseForApplicationCacheQuota()329 {330 m_disallowIncreaseForApplicationCacheQuota = true;331 }332 333 326 bool TestRunner::isCommandEnabled(JSStringRef name) 334 327 { -
trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
r128280 r128296 83 83 void dumpResourceResponseMIMETypes() { m_dumpResourceResponseMIMETypes = true; } 84 84 void dumpWillCacheResponse() { m_dumpWillCacheResponse = true; } 85 void dumpApplicationCacheDelegateCallbacks() { m_dumpApplicationCacheDelegateCallbacks = true; }86 85 87 86 void setShouldDumpFrameLoadCallbacks(bool value) { m_dumpFrameLoadCallbacks = value; } … … 151 150 long long applicationCacheDiskUsageForOrigin(JSStringRef origin); 152 151 void setApplicationCacheOriginQuota(unsigned long long); 153 void disallowIncreaseForApplicationCacheQuota();154 bool shouldDisallowIncreaseForApplicationCacheQuota() { return m_disallowIncreaseForApplicationCacheQuota; }155 152 156 153 // Printing … … 175 172 bool shouldDumpResourceResponseMIMETypes() const { return m_dumpResourceResponseMIMETypes; } 176 173 bool shouldDumpWillCacheResponse() const { return m_dumpWillCacheResponse; } 177 bool shouldDumpApplicationCacheDelegateCallbacks() const { return m_dumpApplicationCacheDelegateCallbacks; }178 174 179 175 bool isPolicyDelegateEnabled() const { return m_policyDelegateEnabled; } … … 272 268 bool m_dumpResourceResponseMIMETypes; 273 269 bool m_dumpWillCacheResponse; 274 bool m_dumpApplicationCacheDelegateCallbacks;275 bool m_disallowIncreaseForApplicationCacheQuota;276 270 bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called. 277 271 bool m_testRepaint;
Note: See TracChangeset
for help on using the changeset viewer.