Index: webkit/compositor_bindings/WebDecorationLayerImpl.h |
diff --git a/third_party/mesa/MesaLib/src/glsl/safe_strcmp.c b/webkit/compositor_bindings/WebDecorationLayerImpl.h |
similarity index 69% |
copy from third_party/mesa/MesaLib/src/glsl/safe_strcmp.c |
copy to webkit/compositor_bindings/WebDecorationLayerImpl.h |
index 4789a92ae6dd9daf7583dfcad5c3c9d8eadf64c6..f7d39e8dd88434d274849bd6bdcb8e016bb60137 100644 |
--- a/third_party/mesa/MesaLib/src/glsl/safe_strcmp.c |
+++ b/webkit/compositor_bindings/WebDecorationLayerImpl.h |
@@ -1,5 +1,5 @@ |
/* |
- * Copyright (C) 2010 Google Inc. All rights reserved. |
+ * Copyright (C) 2012 Google Inc. All rights reserved. |
* |
* Redistribution and use in source and binary forms, with or without |
* modification, are permitted provided that the following conditions |
@@ -23,15 +23,29 @@ |
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#include "safe_strcmp.h" |
+#ifndef WebDecorationLayerImpl_h |
+#define WebDecorationLayerImpl_h |
-#include <string.h> |
+#include "SkBitmap.h" |
danakj
2012/09/24 14:35:00
this include seems to be unused here.
|
+#include <public/WebDecorationLayer.h> |
+#include <wtf/OwnPtr.h> |
-int |
-safe_strcmp(const char* s1, const char* s2) |
-{ |
- if (s1 == NULL || s2 == NULL) { |
- return (s1 != s2); |
- } |
- return strcmp(s1, s2); |
-} |
+namespace WebKit { |
+ |
+class WebLayerImpl; |
+ |
+class WebDecorationLayerImpl : public WebDecorationLayer { |
+public: |
+ WebDecorationLayerImpl(); |
+ virtual ~WebDecorationLayerImpl(); |
+ |
+ // WebDecorationLayer implementation. |
+ virtual WebLayer* layer() OVERRIDE; |
+ |
+private: |
+ OwnPtr<WebLayerImpl> m_layer; |
+}; |
+ |
+} // namespace WebKit |
+ |
+#endif // WebDecorationLayerImpl_h |