Title: [121264] trunk/Source/WebKit/chromium
- Revision
- 121264
- Author
- shawnsi...@chromium.org
- Date
- 2012-06-26 09:20:07 -0700 (Tue, 26 Jun 2012)
Log Message
[chromium] Fix incorrect #ifdef WEBKIT_IMPLEMENTATION statements
https://bugs.webkit.org/show_bug.cgi?id=89931
Reviewed by James Robinson.
WEBKIT_IMPLEMENTATION is defined as either 0 or 1, so the usage of
#ifdef or #if have different behavior. There are some places in
the code that use "#ifdef WEBKIT_IMLPEMENTATION", but they should
actually be "#if WEBKIT_IMPLEMENTATION". This patch fixes those
#ifdef statements.
* public/WebTextRun.h:
(WebTextRun):
* public/linux/WebFontRenderStyle.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (121263 => 121264)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-26 15:00:43 UTC (rev 121263)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-26 16:20:07 UTC (rev 121264)
@@ -1,3 +1,20 @@
+2012-06-26 Shawn Singh <shawnsi...@chromium.org>
+
+ [chromium] Fix incorrect #ifdef WEBKIT_IMPLEMENTATION statements
+ https://bugs.webkit.org/show_bug.cgi?id=89931
+
+ Reviewed by James Robinson.
+
+ WEBKIT_IMPLEMENTATION is defined as either 0 or 1, so the usage of
+ #ifdef or #if have different behavior. There are some places in
+ the code that use "#ifdef WEBKIT_IMLPEMENTATION", but they should
+ actually be "#if WEBKIT_IMPLEMENTATION". This patch fixes those
+ #ifdef statements.
+
+ * public/WebTextRun.h:
+ (WebTextRun):
+ * public/linux/WebFontRenderStyle.h:
+
2012-06-26 Jun Mukai <mu...@chromium.org>
Allow using <input type="color"> UI in ChromeOS.
Modified: trunk/Source/WebKit/chromium/public/WebTextRun.h (121263 => 121264)
--- trunk/Source/WebKit/chromium/public/WebTextRun.h 2012-06-26 15:00:43 UTC (rev 121263)
+++ trunk/Source/WebKit/chromium/public/WebTextRun.h 2012-06-26 16:20:07 UTC (rev 121264)
@@ -33,7 +33,7 @@
#include "platform/WebString.h"
-#ifdef WEBKIT_IMPLEMENTATION
+#if WEBKIT_IMPLEMENTATION
namespace WebCore { class TextRun; }
#endif
@@ -56,7 +56,7 @@
bool rtl;
bool directionalOverride;
-#ifdef WEBKIT_IMPLEMENTATION
+#if WEBKIT_IMPLEMENTATION
// The resulting WebCore::TextRun will refer to the text in this
// struct, so "this" must outlive the WebCore text run.
operator WebCore::TextRun() const;
Modified: trunk/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h (121263 => 121264)
--- trunk/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h 2012-06-26 15:00:43 UTC (rev 121263)
+++ trunk/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h 2012-06-26 16:20:07 UTC (rev 121264)
@@ -50,7 +50,7 @@
char useSubpixelRendering; // use subpixel rendering (partially-filled pixels)
char useSubpixelPositioning; // use subpixel positioning (fractional X positions for glyphs)
-#ifdef WEBKIT_IMPLEMENTATION
+#if WEBKIT_IMPLEMENTATION
// Translates the members of this struct to a FontRenderStyle
void toFontRenderStyle(WebCore::FontRenderStyle*);
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
