Title: [160190] branches/safari-537.60-branch/Source/WebKit
- Revision
- 160190
- Author
- [email protected]
- Date
- 2013-12-05 13:15:59 -0800 (Thu, 05 Dec 2013)
Log Message
../WebKit: Merge build fix r160188
2013-12-05 Brent Fulgham <[email protected]>
[Win] Avoid copying compiled-in resources to DSTROOT
https://bugs.webkit.org/show_bug.cgi?id=125309
Reviewed by Jer Noble.
* WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Only copy Info.plist to the final WebKit.resource bundle.
The PNG and RC files are compiled into the WebKit.dll library.
../WebKit/win: Merge r160184
2013-12-04 Brent Fulgham <[email protected]>
[Win] Exiting from Media Full Screen mode via 'escape' key does not work properly
https://bugs.webkit.org/show_bug.cgi?id=125272
Reviewed by Jer Noble.
* WebView.cpp:
(WebView::fullScreenClientWillExitFullScreen): Change to webkitCancelFullScreen method call
to more closely match Media Control behavior.
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebKit/ChangeLog (160189 => 160190)
--- branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-12-05 20:44:41 UTC (rev 160189)
+++ branches/safari-537.60-branch/Source/WebKit/ChangeLog 2013-12-05 21:15:59 UTC (rev 160190)
@@ -1,3 +1,17 @@
+2013-12-05 Brent Fulgham <[email protected]>
+
+ Merge build fix r160188
+
+ 2013-12-05 Brent Fulgham <[email protected]>
+
+ [Win] Avoid copying compiled-in resources to DSTROOT
+ https://bugs.webkit.org/show_bug.cgi?id=125309
+
+ Reviewed by Jer Noble.
+
+ * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Only copy Info.plist to the final WebKit.resource bundle.
+ The PNG and RC files are compiled into the WebKit.dll library.
+
2013-12-04 Brent Fulgham <[email protected]>
Merge r160118.
Modified: branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd (160189 => 160190)
--- branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2013-12-05 20:44:41 UTC (rev 160189)
+++ branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2013-12-05 21:15:59 UTC (rev 160190)
@@ -15,7 +15,7 @@
echo Copying resources...
mkdir "%ResourcesDirectory%" 2>NUL
-xcopy /y /d "%PROJECTDIR%\..\..\win\WebKit.resources\*" "%ResourcesDirectory%" >NUL
+xcopy /y /d "%PROJECTDIR%\..\..\win\WebKit.resources\Info.plist" "%ResourcesDirectory%" >NUL
if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
Modified: branches/safari-537.60-branch/Source/WebKit/win/ChangeLog (160189 => 160190)
--- branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2013-12-05 20:44:41 UTC (rev 160189)
+++ branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2013-12-05 21:15:59 UTC (rev 160190)
@@ -1,3 +1,18 @@
+2013-12-05 Brent Fulgham <[email protected]>
+
+ Merge r160184
+
+ 2013-12-04 Brent Fulgham <[email protected]>
+
+ [Win] Exiting from Media Full Screen mode via 'escape' key does not work properly
+ https://bugs.webkit.org/show_bug.cgi?id=125272
+
+ Reviewed by Jer Noble.
+
+ * WebView.cpp:
+ (WebView::fullScreenClientWillExitFullScreen): Change to webkitCancelFullScreen method call
+ to more closely match Media Control behavior.
+
2013-10-28 Lucas Forschler <[email protected]>
Merge r156302
Modified: branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp (160189 => 160190)
--- branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp 2013-12-05 20:44:41 UTC (rev 160189)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp 2013-12-05 21:15:59 UTC (rev 160190)
@@ -6929,7 +6929,7 @@
void WebView::fullScreenClientWillExitFullScreen()
{
ASSERT(m_fullScreenElement);
- m_fullScreenElement->document()->webkitWillExitFullScreenForElement(m_fullScreenElement.get());
+ m_fullScreenElement->document()->webkitCancelFullScreen();
}
void WebView::fullScreenClientDidExitFullScreen()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes