Title: [145483] trunk/Source/WebCore
- Revision
- 145483
- Author
- [email protected]
- Date
- 2013-03-11 22:51:46 -0700 (Mon, 11 Mar 2013)
Log Message
Fix the Windows build by providing implementations of PlatformCAFilters::setFiltersOnLayer(),
PlatformCAFilters::numAnimatedFilterProperties() and PlatformCAFilters::animatedFilterPropertyName(),
adding PlatformCAFiltersWin.cpp to the vcproj.
* WebCore.vcproj/WebCore.vcproj:
* platform/graphics/ca/PlatformCAFilters.h:
(PlatformCAFilters):
* platform/graphics/ca/win/PlatformCAFiltersWin.cpp: Copied from Source/WebCore/platform/graphics/ca/PlatformCAFilters.h.
(PlatformCAFilters::setFiltersOnLayer):
(PlatformCAFilters::numAnimatedFilterProperties):
(PlatformCAFilters::animatedFilterPropertyName):
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145482 => 145483)
--- trunk/Source/WebCore/ChangeLog 2013-03-12 05:51:05 UTC (rev 145482)
+++ trunk/Source/WebCore/ChangeLog 2013-03-12 05:51:46 UTC (rev 145483)
@@ -1,3 +1,17 @@
+2013-03-11 Simon Fraser <[email protected]>
+
+ Fix the Windows build by providing implementations of PlatformCAFilters::setFiltersOnLayer(),
+ PlatformCAFilters::numAnimatedFilterProperties() and PlatformCAFilters::animatedFilterPropertyName(),
+ adding PlatformCAFiltersWin.cpp to the vcproj.
+
+ * WebCore.vcproj/WebCore.vcproj:
+ * platform/graphics/ca/PlatformCAFilters.h:
+ (PlatformCAFilters):
+ * platform/graphics/ca/win/PlatformCAFiltersWin.cpp: Copied from Source/WebCore/platform/graphics/ca/PlatformCAFilters.h.
+ (PlatformCAFilters::setFiltersOnLayer):
+ (PlatformCAFilters::numAnimatedFilterProperties):
+ (PlatformCAFilters::animatedFilterPropertyName):
+
2013-03-11 Jochen Eisinger <[email protected]>
Don't create multiple user gesture indicators when forwarding events to sub frames
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (145482 => 145483)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-03-12 05:51:05 UTC (rev 145482)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2013-03-12 05:51:46 UTC (rev 145483)
@@ -32637,6 +32637,14 @@
>
</File>
<File
+ RelativePath="..\platform\graphics\ca\PlatformCAFilters.h"
+ >
+ </File>
+ <File
+ RelativePath="..\platform\graphics\ca\PlatformCAFilters.cpp"
+ >
+ </File>
+ <File
RelativePath="..\platform\graphics\ca\PlatformCALayer.h"
>
</File>
Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h (145482 => 145483)
--- trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2013-03-12 05:51:05 UTC (rev 145482)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h 2013-03-12 05:51:46 UTC (rev 145483)
@@ -49,7 +49,9 @@
static int numAnimatedFilterProperties(FilterOperation::OperationType);
static const char* animatedFilterPropertyName(FilterOperation::OperationType, int internalFilterPropertyIndex);
+#if PLATFORM(MAC)
static RetainPtr<NSValue> filterValueForOperation(const FilterOperation*, int internalFilterPropertyIndex);
+#endif
#ifdef USE_CA_FILTERS
static RetainPtr<NSValue> colorMatrixValueForFilter(const FilterOperation&);
Copied: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp (from rev 145481, trunk/Source/WebCore/platform/graphics/ca/PlatformCAFilters.h) (0 => 145483)
--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCAFiltersWin.cpp 2013-03-12 05:51:46 UTC (rev 145483)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if USE(ACCELERATED_COMPOSITING)
+#if ENABLE(CSS_FILTERS)
+
+#import "PlatformCAFilters.h"
+
+using namespace WebCore;
+
+void PlatformCAFilters::setFiltersOnLayer(PlatformCALayer* platformCALayer, const FilterOperations& filters)
+{
+ // Hardware filter animation not implemented on Windows.
+}
+
+int PlatformCAFilters::numAnimatedFilterProperties(FilterOperation::OperationType type)
+{
+ // Hardware filter animation not implemented on Windows.
+ return 0;
+}
+
+const char* PlatformCAFilters::animatedFilterPropertyName(FilterOperation::OperationType type, int internalFilterPropertyIndex)
+{
+ // Hardware filter animation not implemented on Windows.
+ return "";
+}
+
+#endif // ENABLE(CSS_FILTERS)
+#endif // USE(ACCELERATED_COMPOSITING)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
