Changeset 442

Timestamp:

08/19/08 09:49:01 (4 months ago)

Author:

mbensi

Message:

2008-08-19 Mario Bensi <mbensi@pleyo.com>

Reviewed by Olivier DOLE.
fix ticket #265

• OrigynWebBrowser/Api/DefaultPolicyDelegate.cpp:
  

Files:

• trunk/GeneratedSources/CMakeLists.txt (modified) (2 diffs)
• trunk/WebCore/css/CSSParser.cpp (modified) (1 diff)
• trunk/WebCore/css/CSSParser.h (modified) (1 diff)
• trunk/WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)
• trunk/WebCore/css/CSSStyleSelector.h (modified) (1 diff)
• trunk/WebKit/ChangeLogOWB (modified) (1 diff)
• trunk/WebKit/OrigynWebBrowser/Api/DefaultPolicyDelegate.cpp (modified) (1 diff)

trunk/GeneratedSources/CMakeLists.txt

@@ -458 +458 @@
-            DEPENDS ${CMAKE_SOURCE_DIR}/WebCore/html/HTMLTagNames.in ${CMAKE_SOURCE_DIR}/WebCore/html/HTMLAttributeNames.in
-        )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-ELSE (NOT WEBKIT_USE_HTML_EXTENSION)
-    INCLUDE (${CMAKE_SOURCE_DIR}/HtmlExt/Resources/CMakeLists.txt)
@@ -470 +508 @@
-)
-
-
-ADD_CUSTOM_COMMAND (OUTPUT ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSValueKeywords.h ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSValueKeywords.c
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/generated_sources/WebCore
-    COMMAND cp ${CMAKE_SOURCE_DIR}/WebCore/css/CSSValueKeywords.in ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSValueKeywords.in
-    COMMAND perl -ne 'print lc' ${CMAKE_SOURCE_DIR}/WebCore/css/SVGCSSValueKeywords.in > ${CMAKE_BINARY_DIR}/generated_sources/WebCore/SVGCSSValueKeywords.in
-    COMMAND cat ${CMAKE_BINARY_DIR}/generated_sources/WebCore/SVGCSSValueKeywords.in >> ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSValueKeywords.in
-    COMMAND perl ${CMAKE_SOURCE_DIR}/WebCore/css/makevalues.pl
-    DEPENDS ${CMAKE_SOURCE_DIR}/WebCore/css/SVGCSSValueKeywords.in
-)
-
-IF (WEBKIT_USE_SVG)
-    ADD_CUSTOM_COMMAND (OUTPUT ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.cpp ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.h
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/generated_sources/WebCore
-        COMMAND cp ${CMAKE_SOURCE_DIR}/WebCore/css/CSSPropertyNames.in ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.in
-        COMMAND cat ${CMAKE_SOURCE_DIR}/WebCore/css/SVGCSSPropertyNames.in >> ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.in
-        COMMAND cat ${CMAKE_SOURCE_DIR}/WebCore/css/DashboardSupportCSSPropertyNames.in >> ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.in
-        COMMAND perl ${CMAKE_SOURCE_DIR}/WebCore/css/makeprop.pl
-        DEPENDS ${CMAKE_SOURCE_DIR}/WebCore/css/CSSPropertyNames.in
-    )
-
-ELSE (WEBKIT_USE_SVG)
-    ADD_CUSTOM_COMMAND (OUTPUT ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.cpp ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.h
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/generated_sources/WebCore
-        COMMAND cp ${CMAKE_SOURCE_DIR}/WebCore/css/CSSPropertyNames.in ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.in
-        COMMAND cat ${CMAKE_SOURCE_DIR}/WebCore/css/DashboardSupportCSSPropertyNames.in >> ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSPropertyNames.in
-        COMMAND perl ${CMAKE_SOURCE_DIR}/WebCore/css/makeprop.pl
-        DEPENDS ${CMAKE_SOURCE_DIR}/WebCore/css/CSSPropertyNames.in
-    )
-    
-#    ADD_CUSTOM_COMMAND (OUTPUT ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSValueKeywords.h ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSValueKeywords.c
-#        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/generated_sources/WebCore
-#        COMMAND cp ${CMAKE_SOURCE_DIR}/WebCore/css/CSSValueKeywords.in ${CMAKE_BINARY_DIR}/generated_sources/WebCore/CSSValueKeywords.in
-#        COMMAND perl -ne 'print lc' ${CMAKE_SOURCE_DIR}/WebCore/css/SVGCSSValueKeywords.in > ${CMAKE_BINARY_DIR}/generated_sources/WebCore/SVGCSSValueKeywords.in
-#        COMMAND perl ${CMAKE_SOURCE_DIR}/WebCore/css/makevalues.pl
-#        DEPENDS ${CMAKE_SOURCE_DIR}/WebCore/css/SVGCSSValueKeywords.in
-#    )
-ENDIF (WEBKIT_USE_SVG)
-
-

trunk/WebCore/css/CSSParser.cpp

@@ -1585 +1585 @@
-#if ENABLE(SVG)
-    default:
+#ifdef __HTML_EXT__
+        if(!parsePleyoValue(propId, important))
+            return parseSVGValue(propId, important);
+        return true;
+#else
-        return parseSVGValue(propId, important);
+#endif
+#else
+#ifdef __HTML_EXT__
+    default:
+        return parsePleyoValue(propId, important);
+#endif
-#endif
-    }

trunk/WebCore/css/CSSParser.h

@@ -134 +134 @@
-#endif
-
+#ifdef __HTML_EXT__
+        bool parsePleyoValue(int propId, bool important);
+#endif
+
-        // CSS3 Parsing Routines (for properties specific to CSS3)
-        bool parseShadow(int propId, bool important);

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -4915 +4915 @@
-#if ENABLE(SVG)
-    default:
+#ifdef __HTML_EXT__
+        if(!applyPleyoProperty(id, value))
+            // Try the SVG properties
+            applySVGProperty(id, value);
+#else
-        // Try the SVG properties
-        applySVGProperty(id, value);
+#endif
+#else
+#ifdef __HTML_EXT__
+    default:
+        applyPleyoProperty(id, value);
+#endif
-#endif
-    }

trunk/WebCore/css/CSSStyleSelector.h

@@ -238 +238 @@
-        void applySVGProperty(int id, CSSValue*);
-#endif
+#ifdef __HTML_EXT__
+        bool applyPleyoProperty(int id, CSSValue*);
+#endif
-
-        StyleImage* styleImage(CSSValue* value);

trunk/WebKit/ChangeLogOWB

@@ +1 @@
+2008-08-19  Mario Bensi  <mbensi@pleyo.com>
+
+        Reviewed by Olivier DOLE.
+        fix ticket #265
+
+        * OrigynWebBrowser/Api/DefaultPolicyDelegate.cpp:
+
-2008-08-18  Olivier DOLE  <odole@pleyo.com>
-

trunk/WebKit/OrigynWebBrowser/Api/DefaultPolicyDelegate.cpp

@@ -40 +40 @@
-#include <sys/types.h> 
-#include <sys/stat.h> 
-
+
+
+
+
+
+
+
+
+
-#include DEEPSEE_INCLUDE
-