Changeset 85954 in webkit
- Timestamp:
- May 6, 2011 10:04:39 AM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r85925 r85954 1 2011-05-06 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r85919. 4 http://trac.webkit.org/changeset/85919 5 https://bugs.webkit.org/show_bug.cgi?id=60378 6 7 broke chromium database tests (Requested by inferno-sec on 8 #webkit). 9 10 * public/WebPermissionClient.h: 11 * src/IDBFactoryBackendProxy.cpp: 12 (WebKit::IDBFactoryBackendProxy::open): 13 1 14 2011-05-04 Philippe Normand <pnormand@igalia.com> 2 15 -
trunk/Source/WebKit/chromium/public/WebPermissionClient.h
r85919 r85954 35 35 36 36 class WebFrame; 37 class WebSecurityOrigin;38 37 class WebString; 39 38 … … 45 44 // Controls whether images are allowed for this frame. 46 45 virtual bool allowImages(WebFrame*, bool enabledPerSettings) { return enabledPerSettings; } 47 48 // Controls whether access to Indexed DB are allowed for this frame.49 virtual bool allowIndexedDB(WebFrame*, const WebString& name, const WebSecurityOrigin&) { return true; }50 46 51 47 // Controls whether plugins are allowed for this frame. -
trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
r85919 r85954 43 43 #include "WebKit.h" 44 44 #include "WebKitClient.h" 45 #include "WebPermissionClient.h"46 45 #include "WebVector.h" 47 #include "WebViewImpl.h"48 46 49 47 using namespace WebCore; … … 67 65 void IDBFactoryBackendProxy::open(const String& name, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<SecurityOrigin> origin, Frame* frame, const String& dataDir, int64_t maximumSize, BackingStoreType backingStoreType) 68 66 { 69 WebFrameImpl* webFrame = WebFrameImpl::fromFrame(frame); 70 WebViewImpl* webView = webFrame->viewImpl(); 71 if (webView->permissionClient() && !webView->permissionClient()->allowIndexedDB(webFrame, name, origin)) { 72 callbacks->onError(WebIDBDatabaseError(0, "The user denied permission to access the database.")); 73 return; 74 } 75 67 WebFrame* webFrame = WebFrameImpl::fromFrame(frame); 76 68 m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir, maximumSize, static_cast<WebIDBFactory::BackingStoreType>(backingStoreType)); 77 69 }
Note: See TracChangeset
for help on using the changeset viewer.