Commit 08316f74 authored by mrowe@apple.com's avatar mrowe@apple.com

Roll out r162483. It removes SPI that is currently in use.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162495 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 469a346b
......@@ -43,14 +43,6 @@
of the two original scales when doing so, so that it is absolutely certain
to fit inside space allocated for the image during layout.
2014-01-21 Roger Fong <roger_fong@apple.com>
Unreviewed. WebGLLoadPolicy::WebGLAsk is an unnecessary value.
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext):
* loader/FrameLoaderTypes.h:
2014-01-21 Simon Fraser <simon.fraser@apple.com>
Remove #if PLATFORM(IOS) in various places around customFixedPositionLayoutRect() code
......@@ -230,6 +230,9 @@ CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, Canvas
if (page && !document().url().isLocalFile()) {
WebGLLoadPolicy policy = page->mainFrame().loader().client().webGLPolicyForURL(document().url());
if (policy == WebGLAsk)
return nullptr;
if (policy == WebGLBlock)
return nullptr;
}
......
......@@ -107,8 +107,9 @@ namespace WebCore {
};
enum WebGLLoadPolicy {
WebGLBlock = 0,
WebGLAllow
WebGLAsk = 0,
WebGLAllow,
WebGLBlock
};
}
......
......@@ -56,14 +56,6 @@
* UIProcess/mac/ViewGestureController.mm: Renamed from Source/WebKit2/UIProcess/mac/ViewGestureController.cpp.
* WebKit2.xcodeproj/project.pbxproj:
2014-01-21 Roger Fong <roger_fong@apple.com>
Unreviewed. WebGLLoadPolicy::WebGLAsk is an unnecessary value.
* UIProcess/API/C/WKAPICast.h:
(WebKit::toWebGLLoadPolicy):
* UIProcess/API/C/WKPageLoaderClient.h:
2014-01-21 Anders Carlsson <andersca@apple.com>
Make all the WebKit2 headers private and move Cocoa UIProcess API headers to a Deprecated group
......
......@@ -480,6 +480,8 @@ inline PluginModuleLoadPolicy toPluginModuleLoadPolicy(WKPluginLoadPolicy plugin
inline WebCore::WebGLLoadPolicy toWebGLLoadPolicy(WKWebGLLoadPolicy webGLLoadPolicy)
{
switch (webGLLoadPolicy) {
case kWKWebGLLoadPolicyInactive:
return WebCore::WebGLAsk;
case kWKWebGLLoadPolicyLoadNormally:
return WebCore::WebGLAllow;
case kWKWebGLLoadPolicyBlocked:
......
......@@ -43,8 +43,9 @@ enum {
typedef uint32_t WKPluginLoadPolicy;
enum {
kWKWebGLLoadPolicyBlocked = 0,
kWKWebGLLoadPolicyInactive = 0,
kWKWebGLLoadPolicyLoadNormally,
kWKWebGLLoadPolicyBlocked
};
typedef uint32_t WKWebGLLoadPolicy;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment