Title: [165871] branches/safari-537.75-branch/Source
- Revision
- 165871
- Author
- jer.no...@apple.com
- Date
- 2014-03-18 23:22:46 -0700 (Tue, 18 Mar 2014)
Log Message
Unreviewed Win64 build fix; explicit operators are not valid in VS2010.
Source/WebCore:
With the 'explicit bool' operator removed, just test weakThis.get() explicitly.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::checkPlayability):
Source/WTF:
* wtf/WeakPtr.h: Remove the 'explicit bool' operator.
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/WTF/ChangeLog (165870 => 165871)
--- branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-03-19 06:16:40 UTC (rev 165870)
+++ branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-03-19 06:22:46 UTC (rev 165871)
@@ -1,5 +1,11 @@
2014-03-18 Jer Noble <jer.no...@apple.com>
+ Unreviewed Win64 build fix; explicit operators are not valid in VS2010.
+
+ * wtf/WeakPtr.h: Remove the 'explicit bool' operator.
+
+2014-03-18 Jer Noble <jer.no...@apple.com>
+
Merge r165425.
2014-03-10 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-537.75-branch/Source/WTF/wtf/WeakPtr.h (165870 => 165871)
--- branches/safari-537.75-branch/Source/WTF/wtf/WeakPtr.h 2014-03-19 06:16:40 UTC (rev 165870)
+++ branches/safari-537.75-branch/Source/WTF/wtf/WeakPtr.h 2014-03-19 06:22:46 UTC (rev 165871)
@@ -88,7 +88,6 @@
WeakPtr(PassRefPtr<WeakReference<T> > ref) : m_ref(ref) { }
T* get() const { return m_ref->get(); }
- explicit operator bool() const { return m_ref->get(); }
T* operator->() const { return m_ref->get(); }
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165870 => 165871)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-19 06:16:40 UTC (rev 165870)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-19 06:22:46 UTC (rev 165871)
@@ -1,5 +1,14 @@
2014-03-18 Jer Noble <jer.no...@apple.com>
+ Unreviewed Win64 build fix; explicit operators are not valid in VS2010.
+
+ With the 'explicit bool' operator removed, just test weakThis.get() explicitly.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::checkPlayability):
+
+2014-03-18 Jer Noble <jer.no...@apple.com>
+
Merge r165478.
2014-03-12 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (165870 => 165871)
--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-03-19 06:16:40 UTC (rev 165870)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-03-19 06:22:46 UTC (rev 165871)
@@ -506,7 +506,7 @@
[m_avAsset.get() loadValuesAsynchronouslyForKeys:[NSArray arrayWithObject:@"playable"] completionHandler:^{
dispatch_async(dispatch_get_main_queue(), ^{
- if (weakThis)
+ if (weakThis.get())
weakThis->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::AssetPlayabilityKnown);
});
}];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
