Title: [198640] trunk/Source/WebKit/mac
- Revision
- 198640
- Author
- [email protected]
- Date
- 2016-03-24 12:05:22 -0700 (Thu, 24 Mar 2016)
Log Message
Fix some new PDFKit-related warnings
https://bugs.webkit.org/show_bug.cgi?id=155847
<rdar://problem/25340312>
Reviewed by Anders Carlsson.
* WebView/WebPDFView.mm:
(-[WebPDFView setViewState:]):
* WebView/WebPreferences.mm:
(-[WebPreferences PDFDisplayMode]):
PDFDisplayMode is now a real enum.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (198639 => 198640)
--- trunk/Source/WebKit/mac/ChangeLog 2016-03-24 18:56:04 UTC (rev 198639)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-24 19:05:22 UTC (rev 198640)
@@ -1,3 +1,17 @@
+2016-03-24 Tim Horton <[email protected]>
+
+ Fix some new PDFKit-related warnings
+ https://bugs.webkit.org/show_bug.cgi?id=155847
+ <rdar://problem/25340312>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebPDFView.mm:
+ (-[WebPDFView setViewState:]):
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences PDFDisplayMode]):
+ PDFDisplayMode is now a real enum.
+
2016-03-23 Anders Carlsson <[email protected]>
Crash when using KVO from within -[WebView initWithCoder:]
Modified: trunk/Source/WebKit/mac/WebView/WebPDFView.mm (198639 => 198640)
--- trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2016-03-24 18:56:04 UTC (rev 198639)
+++ trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2016-03-24 19:05:22 UTC (rev 198640)
@@ -860,7 +860,7 @@
ASSERT([statePList isKindOfClass:[NSArray class]]);
NSArray *state = statePList;
int i = 0;
- PDFDisplayMode mode = [[state objectAtIndex:i++] intValue];
+ PDFDisplayMode mode = static_cast<PDFDisplayMode>([[state objectAtIndex:i++] intValue]);
[PDFSubview setDisplayMode:mode];
if (mode == kPDFDisplaySinglePage || mode == kPDFDisplayTwoUp) {
unsigned int pageIndex = [[state objectAtIndex:i++] unsignedIntValue];
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (198639 => 198640)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-24 18:56:04 UTC (rev 198639)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-24 19:05:22 UTC (rev 198640)
@@ -1578,7 +1578,7 @@
#if !PLATFORM(IOS)
- (PDFDisplayMode)PDFDisplayMode
{
- PDFDisplayMode value = [self _integerValueForKey:WebKitPDFDisplayModePreferenceKey];
+ PDFDisplayMode value = static_cast<PDFDisplayMode>([self _integerValueForKey:WebKitPDFDisplayModePreferenceKey]);
if (value != kPDFDisplaySinglePage && value != kPDFDisplaySinglePageContinuous && value != kPDFDisplayTwoUp && value != kPDFDisplayTwoUpContinuous) {
// protect against new modes from future versions of OS X stored in defaults
value = kPDFDisplaySinglePageContinuous;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
