Title: [213271] trunk/Source
Revision
213271
Author
achristen...@apple.com
Date
2017-03-01 23:32:40 -0800 (Wed, 01 Mar 2017)

Log Message

Actually fix Windows build.

Source/WebCore:

* platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
Win32Handle is now in WTF namespace.

Source/WebKit/win:

* WebFrame.cpp:
(WebFrame::invalidate):
r213266 changed Style::Force to ResolveStyleType::Rebuild, so I did so here.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (213270 => 213271)


--- trunk/Source/WebCore/ChangeLog	2017-03-02 07:20:12 UTC (rev 213270)
+++ trunk/Source/WebCore/ChangeLog	2017-03-02 07:32:40 UTC (rev 213271)
@@ -1,5 +1,12 @@
 2017-03-01  Alex Christensen  <achristen...@webkit.org>
 
+        Actually fix Windows build.
+
+        * platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
+        Win32Handle is now in WTF namespace.
+
+2017-03-01  Alex Christensen  <achristen...@webkit.org>
+
         Fix WinCairo build after r213214
         https://bugs.webkit.org/show_bug.cgi?id=168908
 

Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h (213270 => 213271)


--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h	2017-03-02 07:20:12 UTC (rev 213270)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h	2017-03-02 07:32:40 UTC (rev 213271)
@@ -245,9 +245,9 @@
         Direct3DPresenter* m_presenter { nullptr };
 
         DWORD m_threadID { 0 };
-        Win32Handle m_schedulerThread;
-        Win32Handle m_threadReadyEvent;
-        Win32Handle m_flushEvent;
+        WTF::Win32Handle m_schedulerThread;
+        WTF::Win32Handle m_threadReadyEvent;
+        WTF::Win32Handle m_flushEvent;
 
         float m_playbackRate { 1.0f };
         MFTIME m_frameDuration { 0 };

Modified: trunk/Source/WebKit/win/ChangeLog (213270 => 213271)


--- trunk/Source/WebKit/win/ChangeLog	2017-03-02 07:20:12 UTC (rev 213270)
+++ trunk/Source/WebKit/win/ChangeLog	2017-03-02 07:32:40 UTC (rev 213271)
@@ -1,5 +1,13 @@
 2017-03-01  Alex Christensen  <achristen...@webkit.org>
 
+        Actually fix Windows build.
+
+        * WebFrame.cpp:
+        (WebFrame::invalidate):
+        r213266 changed Style::Force to ResolveStyleType::Rebuild, so I did so here.
+
+2017-03-01  Alex Christensen  <achristen...@webkit.org>
+
         Fix Windows build after r213266
         https://bugs.webkit.org/show_bug.cgi?id=169049
 

Modified: trunk/Source/WebKit/win/WebFrame.cpp (213270 => 213271)


--- trunk/Source/WebKit/win/WebFrame.cpp	2017-03-02 07:20:12 UTC (rev 213270)
+++ trunk/Source/WebKit/win/WebFrame.cpp	2017-03-02 07:32:40 UTC (rev 213271)
@@ -1067,7 +1067,7 @@
     ASSERT(coreFrame);
 
     if (Document* document = coreFrame->document())
-        document->resolveStyle(Style::Force);
+        document->resolveStyle(WebCore::Document::ResolveStyleType::Rebuild);
 }
 
 HRESULT WebFrame::inViewSourceMode(BOOL* flag)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to