Title: [123212] trunk/Source/WebCore
- Revision
- 123212
- Author
- [email protected]
- Date
- 2012-07-20 07:05:08 -0700 (Fri, 20 Jul 2012)
Log Message
[WK2] WebIntents doesn't build if mutation observers is disabled
https://bugs.webkit.org/show_bug.cgi?id=91839
Patch by Thiago Marcos P. Santos <[email protected]> on 2012-07-20
Reviewed by Kenneth Rohde Christiansen.
WebIntents was depending on a code protected by ENABLE(MUTATION_OBSERVERS).
Now the code is also enabled by ENABLE(WEB_INTENTS).
* bindings/js/JSDictionary.cpp:
(WebCore):
* bindings/js/JSDictionary.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (123211 => 123212)
--- trunk/Source/WebCore/ChangeLog 2012-07-20 13:59:48 UTC (rev 123211)
+++ trunk/Source/WebCore/ChangeLog 2012-07-20 14:05:08 UTC (rev 123212)
@@ -1,3 +1,17 @@
+2012-07-20 Thiago Marcos P. Santos <[email protected]>
+
+ [WK2] WebIntents doesn't build if mutation observers is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=91839
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ WebIntents was depending on a code protected by ENABLE(MUTATION_OBSERVERS).
+ Now the code is also enabled by ENABLE(WEB_INTENTS).
+
+ * bindings/js/JSDictionary.cpp:
+ (WebCore):
+ * bindings/js/JSDictionary.h:
+
2012-07-20 Mihnea Ovidenie <[email protected]>
[CSSRegions]Assert failure when layout positioned objects in regions
Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (123211 => 123212)
--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2012-07-20 13:59:48 UTC (rev 123211)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2012-07-20 14:05:08 UTC (rev 123212)
@@ -163,7 +163,7 @@
}
#endif
-#if ENABLE(MUTATION_OBSERVERS)
+#if ENABLE(MUTATION_OBSERVERS) || ENABLE(WEB_INTENTS)
void JSDictionary::convertValue(ExecState* exec, JSValue value, HashSet<AtomicString>& result)
{
result.clear();
Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (123211 => 123212)
--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2012-07-20 13:59:48 UTC (rev 123211)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2012-07-20 14:05:08 UTC (rev 123212)
@@ -102,7 +102,7 @@
#if ENABLE(VIDEO_TRACK)
static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<TrackBase>& result);
#endif
-#if ENABLE(MUTATION_OBSERVERS)
+#if ENABLE(MUTATION_OBSERVERS) || ENABLE(WEB_INTENTS)
static void convertValue(JSC::ExecState*, JSC::JSValue, HashSet<AtomicString>& result);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
