<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178557] branches/safari-600.5-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178557">178557</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 17:58:20 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174106">r174106</a>. rdar://problem/19451946</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178556 => 178557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-16 01:58:16 UTC (rev 178556)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-16 01:58:20 UTC (rev 178557)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174106. rdar://problem/19451946
+
+ 2014-09-30 Eric Carlson <eric.carlson@apple.com>
+
+ [Mac] MediaPlayerPrivateQTKit should not use FrameView
+ https://bugs.webkit.org/show_bug.cgi?id=137119
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove obsolete QTKit code that would fall back to rendering into an NSView.
+ Aside from being dead code, it was only used when accelerated compositing
+ was not enabled and tha hasn't been possible for a long time, it required a
+ layering violation to get the FrameView.
+
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::MediaPlayerPrivateQTKit::currentRenderingMode):
+ (WebCore::MediaPlayerPrivateQTKit::preferredRenderingMode):
+ (WebCore::MediaPlayerPrivateQTKit::setUpVideoRendering):
+ (WebCore::MediaPlayerPrivateQTKit::tearDownVideoRendering):
+ (WebCore::MediaPlayerPrivateQTKit::hasSetUpVideoRendering):
+ (WebCore::MediaPlayerPrivateQTKit::setSize):
+ (WebCore::MediaPlayerPrivateQTKit::paint):
+ (WebCore::mainThreadSetNeedsDisplay): Deleted.
+ (WebCore::MediaPlayerPrivateQTKit::createQTMovieView): Deleted.
+ (WebCore::MediaPlayerPrivateQTKit::detachQTMovieView): Deleted.
+ (-[WebCoreMovieObserver menuForEventDelegate:]): Deleted.
+ (-[WebCoreMovieObserver setView:]): Deleted.
+
+2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r174505. rdar://problem/19451946
</span><span class="cx">
</span><span class="cx"> 2014-10-09 Carlos Garcia Campos <cgarcia@igalia.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (178556 => 178557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-01-16 01:58:16 UTC (rev 178556)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-01-16 01:58:20 UTC (rev 178557)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> OBJC_CLASS NSDictionary;
</span><span class="cx"> OBJC_CLASS NSMutableDictionary;
</span><span class="cx"> OBJC_CLASS QTMovie;
</span><del>-OBJC_CLASS QTMovieView;
</del><span class="cx"> OBJC_CLASS QTMovieLayer;
</span><span class="cx"> OBJC_CLASS QTVideoRendererWebKitOnly;
</span><span class="cx"> OBJC_CLASS WebCoreMovieObserver;
</span><span class="lines">@@ -145,7 +144,7 @@
</span><span class="cx"> void createQTMovie(const String& url);
</span><span class="cx"> void createQTMovie(NSURL *, NSDictionary *movieAttributes);
</span><span class="cx">
</span><del>- enum MediaRenderingMode { MediaRenderingNone, MediaRenderingMovieView, MediaRenderingSoftwareRenderer, MediaRenderingMovieLayer };
</del><ins>+ enum MediaRenderingMode { MediaRenderingNone, MediaRenderingSoftwareRenderer, MediaRenderingMovieLayer };
</ins><span class="cx"> MediaRenderingMode currentRenderingMode() const;
</span><span class="cx"> MediaRenderingMode preferredRenderingMode() const;
</span><span class="cx">
</span><span class="lines">@@ -153,9 +152,6 @@
</span><span class="cx"> void tearDownVideoRendering();
</span><span class="cx"> bool hasSetUpVideoRendering() const;
</span><span class="cx">
</span><del>- void createQTMovieView();
- void detachQTMovieView();
-
</del><span class="cx"> enum QTVideoRendererMode { QTVideoRendererModeDefault, QTVideoRendererModeListensForNewImages };
</span><span class="cx"> void createQTVideoRenderer(QTVideoRendererMode rendererMode);
</span><span class="cx"> void destroyQTVideoRenderer();
</span><span class="lines">@@ -186,7 +182,6 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayer* m_player;
</span><span class="cx"> RetainPtr<QTMovie> m_qtMovie;
</span><del>- RetainPtr<QTMovieView> m_qtMovieView;
</del><span class="cx"> RetainPtr<QTVideoRendererWebKitOnly> m_qtVideoRenderer;
</span><span class="cx"> RetainPtr<WebCoreMovieObserver> m_objcObserver;
</span><span class="cx"> String m_movieURL;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (178556 => 178557)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-01-16 01:58:16 UTC (rev 178556)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-01-16 01:58:20 UTC (rev 178557)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "DocumentLoader.h"
</span><del>-#import "FrameView.h"
</del><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "URL.h"
</span><span class="cx"> #import "Logging.h"
</span><span class="lines">@@ -57,7 +56,6 @@
</span><span class="cx"> SOFT_LINK(QTKit, QTMakeTime, QTTime, (long long timeValue, long timeScale), (timeValue, timeScale))
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_CLASS(QTKit, QTMovie)
</span><del>-SOFT_LINK_CLASS(QTKit, QTMovieView)
</del><span class="cx"> SOFT_LINK_CLASS(QTKit, QTMovieLayer)
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_POINTER(QTKit, QTTrackMediaTypeAttribute, NSString *)
</span><span class="lines">@@ -102,7 +100,6 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #define QTMovie getQTMovieClass()
</span><del>-#define QTMovieView getQTMovieViewClass()
</del><span class="cx"> #define QTMovieLayer getQTMovieLayerClass()
</span><span class="cx">
</span><span class="cx"> #define QTTrackMediaTypeAttribute getQTTrackMediaTypeAttribute()
</span><span class="lines">@@ -150,21 +147,15 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-@interface FakeQTMovieView : NSObject
-- (WebCoreMovieObserver *)delegate;
-@end
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> @interface WebCoreMovieObserver : NSObject
</span><span class="cx"> {
</span><span class="cx"> MediaPlayerPrivateQTKit* m_callback;
</span><del>- NSView* m_view;
</del><span class="cx"> BOOL m_delayCallbacks;
</span><span class="cx"> }
</span><span class="cx"> -(id)initWithCallback:(MediaPlayerPrivateQTKit*)callback;
</span><span class="cx"> -(void)disconnect;
</span><del>--(void)setView:(NSView*)view;
</del><span class="cx"> -(void)repaint;
</span><span class="cx"> -(void)setDelayCallbacks:(BOOL)shouldDelay;
</span><span class="cx"> -(void)loadStateChanged:(NSNotification *)notification;
</span><span class="lines">@@ -391,81 +382,12 @@
</span><span class="cx"> object:m_qtMovie.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void mainThreadSetNeedsDisplay(id self, SEL)
-{
- id view = [self superview];
- ASSERT(!view || [view isKindOfClass:[QTMovieView class]]);
- if (!view || ![view isKindOfClass:[QTMovieView class]])
- return;
-
- FakeQTMovieView *movieView = static_cast<FakeQTMovieView *>(view);
- WebCoreMovieObserver* delegate = [movieView delegate];
- ASSERT(!delegate || [delegate isKindOfClass:[WebCoreMovieObserver class]]);
- if (!delegate || ![delegate isKindOfClass:[WebCoreMovieObserver class]])
- return;
-
- [delegate repaint];
-}
-
</del><span class="cx"> static Class QTVideoRendererClass()
</span><span class="cx"> {
</span><span class="cx"> static Class QTVideoRendererWebKitOnlyClass = NSClassFromString(@"QTVideoRendererWebKitOnly");
</span><span class="cx"> return QTVideoRendererWebKitOnlyClass;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateQTKit::createQTMovieView()
-{
- LOG(Media, "MediaPlayerPrivateQTKit::createQTMovieView(%p)", this);
- detachQTMovieView();
-
- static bool addedCustomMethods = false;
- if (!m_player->inMediaDocument() && !addedCustomMethods) {
- Class QTMovieContentViewClass = NSClassFromString(@"QTMovieContentView");
- ASSERT(QTMovieContentViewClass);
-
- Method mainThreadSetNeedsDisplayMethod = class_getInstanceMethod(QTMovieContentViewClass, @selector(_mainThreadSetNeedsDisplay));
- ASSERT(mainThreadSetNeedsDisplayMethod);
-
- method_setImplementation(mainThreadSetNeedsDisplayMethod, reinterpret_cast<IMP>(mainThreadSetNeedsDisplay));
- addedCustomMethods = true;
- }
-
- // delay callbacks as we *will* get notifications during setup
- [m_objcObserver.get() setDelayCallbacks:YES];
-
- m_qtMovieView = adoptNS([[QTMovieView alloc] init]);
- setSize(m_player->size());
- NSView* parentView = 0;
- parentView = m_player->frameView()->documentView();
- [parentView addSubview:m_qtMovieView.get()];
- [m_qtMovieView.get() setDelegate:m_objcObserver.get()];
- [m_objcObserver.get() setView:m_qtMovieView.get()];
- [m_qtMovieView.get() setMovie:m_qtMovie.get()];
- [m_qtMovieView.get() setControllerVisible:NO];
- [m_qtMovieView.get() setPreservesAspectRatio:NO];
- // the area not covered by video should be transparent
- [m_qtMovieView.get() setFillColor:[NSColor clearColor]];
-
- // If we're in a media document, allow QTMovieView to render in its default mode;
- // otherwise tell it to draw synchronously.
- // Note that we expect mainThreadSetNeedsDisplay to be invoked only when synchronous drawing is requested.
- if (!m_player->inMediaDocument())
- wkQTMovieViewSetDrawSynchronously(m_qtMovieView.get(), YES);
-
- [m_objcObserver.get() setDelayCallbacks:NO];
-}
-
-void MediaPlayerPrivateQTKit::detachQTMovieView()
-{
- LOG(Media, "MediaPlayerPrivateQTKit::detachQTMovieView(%p)", this);
- if (m_qtMovieView) {
- [m_objcObserver.get() setView:nil];
- [m_qtMovieView.get() setDelegate:nil];
- [m_qtMovieView.get() removeFromSuperview];
- m_qtMovieView = nil;
- }
-}
-
</del><span class="cx"> void MediaPlayerPrivateQTKit::createQTVideoRenderer(QTVideoRendererMode rendererMode)
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateQTKit::createQTVideoRenderer(%p)", this);
</span><span class="lines">@@ -538,9 +460,6 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateQTKit::MediaRenderingMode MediaPlayerPrivateQTKit::currentRenderingMode() const
</span><span class="cx"> {
</span><del>- if (m_qtMovieView)
- return MediaRenderingMovieView;
-
</del><span class="cx"> if (m_qtVideoLayer)
</span><span class="cx"> return MediaRenderingMovieLayer;
</span><span class="cx">
</span><span class="lines">@@ -552,14 +471,14 @@
</span><span class="cx">
</span><span class="cx"> MediaPlayerPrivateQTKit::MediaRenderingMode MediaPlayerPrivateQTKit::preferredRenderingMode() const
</span><span class="cx"> {
</span><del>- if (!m_player->frameView() || !m_qtMovie)
</del><ins>+ if (!m_qtMovie)
</ins><span class="cx"> return MediaRenderingNone;
</span><span class="cx">
</span><span class="cx"> if (supportsAcceleratedRendering() && m_player->mediaPlayerClient()->mediaPlayerRenderingCanBeAccelerated(m_player))
</span><span class="cx"> return MediaRenderingMovieLayer;
</span><span class="cx">
</span><span class="cx"> if (!QTVideoRendererClass())
</span><del>- return MediaRenderingMovieView;
</del><ins>+ return MediaRenderingNone;
</ins><span class="cx">
</span><span class="cx"> return MediaRenderingSoftwareRenderer;
</span><span class="cx"> }
</span><span class="lines">@@ -579,9 +498,6 @@
</span><span class="cx"> tearDownVideoRendering();
</span><span class="cx">
</span><span class="cx"> switch (preferredMode) {
</span><del>- case MediaRenderingMovieView:
- createQTMovieView();
- break;
</del><span class="cx"> case MediaRenderingNone:
</span><span class="cx"> case MediaRenderingSoftwareRenderer:
</span><span class="cx"> createQTVideoRenderer(QTVideoRendererModeListensForNewImages);
</span><span class="lines">@@ -599,8 +515,6 @@
</span><span class="cx"> void MediaPlayerPrivateQTKit::tearDownVideoRendering()
</span><span class="cx"> {
</span><span class="cx"> LOG(Media, "MediaPlayerPrivateQTKit::tearDownVideoRendering(%p)", this);
</span><del>- if (m_qtMovieView)
- detachQTMovieView();
</del><span class="cx"> if (m_qtVideoRenderer)
</span><span class="cx"> destroyQTVideoRenderer();
</span><span class="cx"> if (m_qtVideoLayer)
</span><span class="lines">@@ -609,8 +523,7 @@
</span><span class="cx">
</span><span class="cx"> bool MediaPlayerPrivateQTKit::hasSetUpVideoRendering() const
</span><span class="cx"> {
</span><del>- return m_qtMovieView
- || m_qtVideoLayer
</del><ins>+ return m_qtVideoLayer
</ins><span class="cx"> || m_qtVideoRenderer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1238,13 +1151,6 @@
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateQTKit::setSize(const IntSize&)
</span><span class="cx"> {
</span><del>- // Don't resize the view now because [view setFrame] also resizes the movie itself, and because
- // the renderer calls this function immediately when we report a size change (QTMovieSizeDidChangeNotification)
- // we can get into a feedback loop observing the size change and resetting the size, and this can cause
- // QuickTime to miss resetting a movie's size when the media size changes (as happens with an rtsp movie
- // once the rtsp server sends the track sizes). Instead we remember the size passed to paint() and resize
- // the view when it changes.
- // <rdar://problem/6336092> REGRESSION: rtsp movie does not resize correctly
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateQTKit::setVisible(bool b)
</span><span class="lines">@@ -1308,9 +1214,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (context->paintingDisabled() || m_hasUnsupportedTracks)
</span><span class="cx"> return;
</span><del>- NSView *view = m_qtMovieView.get();
</del><span class="cx"> id qtVideoRenderer = m_qtVideoRenderer.get();
</span><del>- if (!view && !qtVideoRenderer)
</del><ins>+ if (!qtVideoRenderer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [m_objcObserver.get() setDelayCallbacks:YES];
</span><span class="lines">@@ -1326,37 +1231,11 @@
</span><span class="cx">
</span><span class="cx"> newContext = [NSGraphicsContext graphicsContextWithGraphicsPort:context->platformContext() flipped:NO];
</span><span class="cx">
</span><del>- // draw the current video frame
- if (qtVideoRenderer) {
- [NSGraphicsContext saveGraphicsState];
- [NSGraphicsContext setCurrentContext:newContext];
- [(id<WebKitVideoRenderingDetails>)qtVideoRenderer drawInRect:paintRect];
- [NSGraphicsContext restoreGraphicsState];
- } else {
- if (m_rect != r) {
- m_rect = r;
- if (m_player->inMediaDocument()) {
- // the QTMovieView needs to be placed in the proper location for document mode
- [view setFrame:m_rect];
- }
- else {
- // We don't really need the QTMovieView in any specific location so let's just get it out of the way
- // where it won't intercept events or try to bring up the context menu.
- IntRect farAwayButCorrectSize(m_rect);
- farAwayButCorrectSize.move(-1000000, -1000000);
- [view setFrame:farAwayButCorrectSize];
- }
- }
</del><ins>+ [NSGraphicsContext saveGraphicsState];
+ [NSGraphicsContext setCurrentContext:newContext];
+ [(id<WebKitVideoRenderingDetails>)qtVideoRenderer drawInRect:paintRect];
+ [NSGraphicsContext restoreGraphicsState];
</ins><span class="cx">
</span><del>- if (m_player->inMediaDocument()) {
- // If we're using a QTMovieView in a media document, the view may get layer-backed. AppKit won't update
- // the layer hosting correctly if we call displayRectIgnoringOpacity:inContext:, so use displayRectIgnoringOpacity:
- // in this case. See <rdar://problem/6702882>.
- [view displayRectIgnoringOpacity:paintRect];
- } else
- [view displayRectIgnoringOpacity:paintRect inContext:newContext];
- }
-
</del><span class="cx"> #if DRAW_FRAME_RATE
</span><span class="cx"> // Draw the frame rate only after having played more than 10 frames.
</span><span class="cx"> if (m_frameCountWhilePlaying > 10) {
</span><span class="lines">@@ -1713,17 +1592,6 @@
</span><span class="cx"> m_callback = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>--(NSMenu*)menuForEventDelegate:(NSEvent*)theEvent
-{
- // Get the contextual menu from the QTMovieView's superview, the frame view
- return [[m_view superview] menuForEvent:theEvent];
-}
-
--(void)setView:(NSView*)view
-{
- m_view = view;
-}
-
</del><span class="cx"> -(void)repaint
</span><span class="cx"> {
</span><span class="cx"> if (m_delayCallbacks)
</span></span></pre>
</div>
</div>
</body>
</html>