Title: [162483] trunk/Source
Revision
162483
Author
[email protected]
Date
2014-01-21 16:28:04 -0800 (Tue, 21 Jan 2014)

Log Message

Unreviewed. WebGLLoadPolicy::WebGLAsk is an unnecessary value.

* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::getContext):
* loader/FrameLoaderTypes.h:
* UIProcess/API/C/WKAPICast.h:
(WebKit::toWebGLLoadPolicy):
* UIProcess/API/C/WKPageLoaderClient.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (162482 => 162483)


--- trunk/Source/WebCore/ChangeLog	2014-01-22 00:06:00 UTC (rev 162482)
+++ trunk/Source/WebCore/ChangeLog	2014-01-22 00:28:04 UTC (rev 162483)
@@ -1,3 +1,11 @@
+2014-01-21  Roger Fong  <[email protected]>
+
+        Unreviewed. WebGLLoadPolicy::WebGLAsk is an unnecessary value.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::getContext):
+        * loader/FrameLoaderTypes.h:
+
 2014-01-21  Simon Fraser  <[email protected]>
 
         Remove #if PLATFORM(IOS) in various places around customFixedPositionLayoutRect() code

Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (162482 => 162483)


--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp	2014-01-22 00:06:00 UTC (rev 162482)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp	2014-01-22 00:28:04 UTC (rev 162483)
@@ -230,9 +230,6 @@
                 if (page && !document().url().isLocalFile()) {
                     WebGLLoadPolicy policy = page->mainFrame().loader().client().webGLPolicyForURL(document().url());
 
-                    if (policy == WebGLAsk)
-                        return nullptr;
-
                     if (policy == WebGLBlock)
                         return nullptr;
                 }

Modified: trunk/Source/WebCore/loader/FrameLoaderTypes.h (162482 => 162483)


--- trunk/Source/WebCore/loader/FrameLoaderTypes.h	2014-01-22 00:06:00 UTC (rev 162482)
+++ trunk/Source/WebCore/loader/FrameLoaderTypes.h	2014-01-22 00:28:04 UTC (rev 162483)
@@ -107,9 +107,8 @@
     };
     
     enum WebGLLoadPolicy {
-        WebGLAsk = 0,
-        WebGLAllow,
-        WebGLBlock
+        WebGLBlock = 0,
+        WebGLAllow
     };
 
 }

Modified: trunk/Source/WebKit2/ChangeLog (162482 => 162483)


--- trunk/Source/WebKit2/ChangeLog	2014-01-22 00:06:00 UTC (rev 162482)
+++ trunk/Source/WebKit2/ChangeLog	2014-01-22 00:28:04 UTC (rev 162483)
@@ -1,3 +1,11 @@
+2014-01-21  Roger Fong  <[email protected]>
+
+        Unreviewed. WebGLLoadPolicy::WebGLAsk is an unnecessary value.
+
+        * UIProcess/API/C/WKAPICast.h:
+        (WebKit::toWebGLLoadPolicy):
+        * UIProcess/API/C/WKPageLoaderClient.h:
+
 2014-01-21  Anders Carlsson  <[email protected]>
 
         Make all the WebKit2 headers private and move Cocoa UIProcess API headers to a Deprecated group

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (162482 => 162483)


--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h	2014-01-22 00:06:00 UTC (rev 162482)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h	2014-01-22 00:28:04 UTC (rev 162483)
@@ -480,8 +480,6 @@
 inline WebCore::WebGLLoadPolicy toWebGLLoadPolicy(WKWebGLLoadPolicy webGLLoadPolicy)
 {
     switch (webGLLoadPolicy) {
-    case kWKWebGLLoadPolicyInactive:
-        return WebCore::WebGLAsk;
     case kWKWebGLLoadPolicyLoadNormally:
         return WebCore::WebGLAllow;
     case kWKWebGLLoadPolicyBlocked:

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (162482 => 162483)


--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h	2014-01-22 00:06:00 UTC (rev 162482)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h	2014-01-22 00:28:04 UTC (rev 162483)
@@ -43,9 +43,8 @@
 typedef uint32_t WKPluginLoadPolicy;
 
 enum {
-    kWKWebGLLoadPolicyInactive = 0,
+    kWKWebGLLoadPolicyBlocked = 0,
     kWKWebGLLoadPolicyLoadNormally,
-    kWKWebGLLoadPolicyBlocked
 };
 typedef uint32_t WKWebGLLoadPolicy;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to