Title: [158081] trunk/Source/WebKit2
- Revision
- 158081
- Author
- [email protected]
- Date
- 2013-10-25 23:37:23 -0700 (Fri, 25 Oct 2013)
Log Message
Fix the ENABLE(CSS_FILTERS) && USE(COORDINATED_GRAPHICS) build after r157803
https://bugs.webkit.org/show_bug.cgi?id=123330
Reviewed by Darin Adler.
* Shared/WebCoreArgumentCoders.cpp:
* Shared/WebCoreArgumentCoders.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (158080 => 158081)
--- trunk/Source/WebKit2/ChangeLog 2013-10-26 06:13:37 UTC (rev 158080)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-26 06:37:23 UTC (rev 158081)
@@ -1,3 +1,13 @@
+2013-10-25 Csaba Osztrogonác <[email protected]>
+
+ Fix the ENABLE(CSS_FILTERS) && USE(COORDINATED_GRAPHICS) build after r157803
+ https://bugs.webkit.org/show_bug.cgi?id=123330
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ * Shared/WebCoreArgumentCoders.h:
+
2013-10-25 Brady Eidson <[email protected]>
WebIconDatabase can miss private browsing state changes.
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (158080 => 158081)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2013-10-26 06:13:37 UTC (rev 158080)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2013-10-26 06:37:23 UTC (rev 158081)
@@ -1164,7 +1164,7 @@
return true;
}
-#if ENABLE(CSS_FILTERS)
+#if ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
static void encodeFilterOperation(ArgumentEncoder& encoder, const FilterOperation& filter)
{
encoder.encodeEnum(filter.type());
@@ -1305,6 +1305,6 @@
return true;
}
-#endif // ENABLE(CSS_FILTERS)
+#endif // ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
} // namespace CoreIPC
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (158080 => 158081)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2013-10-26 06:13:37 UTC (rev 158080)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2013-10-26 06:37:23 UTC (rev 158081)
@@ -291,12 +291,13 @@
static bool decode(ArgumentDecoder&, WebCore::UserScript&);
};
+#if ENABLE(CSS_FILTERS) && !USE(COORDINATED_GRAPHICS)
template<> struct ArgumentCoder<WebCore::FilterOperations> {
static void encode(ArgumentEncoder&, const WebCore::FilterOperations&);
static bool decode(ArgumentDecoder&, WebCore::FilterOperations&);
};
+#endif
-
} // namespace CoreIPC
#endif // WebCoreArgumentCoders_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
