Title: [114266] trunk/Source/WebCore
- Revision
- 114266
- Author
- j...@apple.com
- Date
- 2012-04-16 09:59:21 -0700 (Mon, 16 Apr 2012)
Log Message
Build fix.
Change set 114220 broke OS X internal build. Change set 114231 attempted to fix it, but isn't entirely
correct. This patch amends change set 114231.
* WebCore.exp.in:
* editing/DictationAlternative.cpp:
(WebCore::DictationAlternative::DictationAlternative):
* editing/DictationAlternative.h:
(DictationAlternative):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114265 => 114266)
--- trunk/Source/WebCore/ChangeLog 2012-04-16 16:37:10 UTC (rev 114265)
+++ trunk/Source/WebCore/ChangeLog 2012-04-16 16:59:21 UTC (rev 114266)
@@ -1,3 +1,16 @@
+2012-04-16 Jia Pu <j...@apple.com>
+
+ Build fix.
+
+ Change set 114220 broke OS X internal build. Change set 114231 attempted to fix it, but isn't entirely
+ correct. This patch amends change set 114231.
+
+ * WebCore.exp.in:
+ * editing/DictationAlternative.cpp:
+ (WebCore::DictationAlternative::DictationAlternative):
+ * editing/DictationAlternative.h:
+ (DictationAlternative):
+
2012-04-16 Antti Koivisto <an...@apple.com>
REGRESSION (r104445): Style is not recomputed on serenaandlily.com
Modified: trunk/Source/WebCore/WebCore.exp.in (114265 => 114266)
--- trunk/Source/WebCore/WebCore.exp.in 2012-04-16 16:37:10 UTC (rev 114265)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-04-16 16:59:21 UTC (rev 114266)
@@ -604,6 +604,7 @@
__ZN7WebCore19TextResourceDecoderC1ERKN3WTF6StringERKNS_12TextEncodingEb
__ZN7WebCore19TextResourceDecoderD1Ev
__ZN7WebCore19applicationIsSafariEv
+__ZN7WebCore20DictationAlternativeC1Ejjy
__ZN7WebCore20DictationAlternativeC1Ev
__ZN7WebCore20DisplaySleepDisablerC1EPKc
__ZN7WebCore20DisplaySleepDisablerD1Ev
Modified: trunk/Source/WebCore/editing/DictationAlternative.cpp (114265 => 114266)
--- trunk/Source/WebCore/editing/DictationAlternative.cpp 2012-04-16 16:37:10 UTC (rev 114265)
+++ trunk/Source/WebCore/editing/DictationAlternative.cpp 2012-04-16 16:59:21 UTC (rev 114266)
@@ -28,7 +28,7 @@
namespace WebCore {
-DictationAlternative::DictationAlternative(unsigned start, unsigned length, unsigned context)
+DictationAlternative::DictationAlternative(unsigned start, unsigned length, uint64_t context)
: rangeStart(start)
, rangeLength(length)
, dictationContext(context)
Modified: trunk/Source/WebCore/editing/DictationAlternative.h (114265 => 114266)
--- trunk/Source/WebCore/editing/DictationAlternative.h 2012-04-16 16:37:10 UTC (rev 114265)
+++ trunk/Source/WebCore/editing/DictationAlternative.h 2012-04-16 16:59:21 UTC (rev 114266)
@@ -30,11 +30,13 @@
namespace WebCore {
struct DictationAlternative {
- DictationAlternative(unsigned start, unsigned length, unsigned context);
+ DictationAlternative(unsigned start, unsigned length, uint64_t context);
DictationAlternative();
unsigned rangeStart;
unsigned rangeLength;
- unsigned dictationContext;
+
+ // This need to be 64 bit becauese it actually holds a pointer in WebKit.
+ uint64_t dictationContext;
};
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
