Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Build fix.

* Shared/DictionaryPopupInfo.cpp:
(WebKit::DictionaryPopupInfo::encode):
(WebKit::DictionaryPopupInfo::decode):
* Shared/DictionaryPopupInfo.h:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@82797 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
commit 38f79281fd2f2510c58860f7984870c0e3049434 1 parent 8942c77
mitz@apple.com authored
View
9 Source/WebKit2/ChangeLog
@@ -1,5 +1,14 @@
2011-04-03 Dan Bernstein <mitz@apple.com>
+ Build fix.
+
+ * Shared/DictionaryPopupInfo.cpp:
+ (WebKit::DictionaryPopupInfo::encode):
+ (WebKit::DictionaryPopupInfo::decode):
+ * Shared/DictionaryPopupInfo.h:
+
+2011-04-03 Dan Bernstein <mitz@apple.com>
+
Reviewed by Maciej Stachowiak.
<rdar://problem/9227839> REGRESSION: Reproducible crash in Snow Leopard when trying to show the Dictionary panel or application
View
4 Source/WebKit2/Shared/DictionaryPopupInfo.cpp
@@ -40,7 +40,7 @@ void DictionaryPopupInfo::encode(CoreIPC::ArgumentEncoder* encoder) const
encoder->encode(fontInfo);
encoder->encodeEnum(type);
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
CoreIPC::encode(encoder, options.get());
#endif
}
@@ -53,7 +53,7 @@ bool DictionaryPopupInfo::decode(CoreIPC::ArgumentDecoder* decoder, DictionaryPo
return false;
if (!decoder->decodeEnum(result.type))
return false;
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
if (!CoreIPC::decode(decoder, result.options))
return false;
#endif
View
2  Source/WebKit2/Shared/DictionaryPopupInfo.h
@@ -52,7 +52,7 @@ struct DictionaryPopupInfo {
WebCore::FloatPoint origin;
FontInfo fontInfo;
Type type;
-#if !defined(BUILDING_ON_SNOW_LEOPARD)
+#if PLATFORM(MAC) && !defined(BUILDING_ON_SNOW_LEOPARD)
RetainPtr<CFDictionaryRef> options;
#endif
};
Please sign in to comment.
Something went wrong with that request. Please try again.