Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: third_party/WebKit/WebCore/rendering/RenderMedia.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/WebCore/rendering/RenderMedia.h
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderMedia.h (revision 9383)
+++ third_party/WebKit/WebCore/rendering/RenderMedia.h (working copy)
@@ -109,8 +109,8 @@
RefPtr<HTMLElement> m_timelineContainer;
RefPtr<MediaTimeDisplayElement> m_currentTimeDisplay;
RefPtr<MediaTimeDisplayElement> m_timeRemainingDisplay;
- Node* m_lastUnderNode;
- Node* m_nodeUnderMouse;
+ EventTargetNode* m_lastUnderNode;
+ EventTargetNode* m_nodeUnderMouse;
Timer<RenderMedia> m_timeUpdateTimer;
Timer<RenderMedia> m_opacityAnimationTimer;
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderMarquee.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698