[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mrowe at apple.com
mrowe at apple.com
Sun Feb 20 23:36:29 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c0e3af40eb30a799d5dc669250e1e995461027b3
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 22 01:46:14 2011 +0000
Fix the build when using Clang by removing some unused variables.
Rubber-stamped by Jon Honeycutt.
* Plugins/Hosted/WebHostedNetscapePluginView.mm:
(-[WebHostedNetscapePluginView updateAndSetWindow]):
* WebView/WebFullScreenController.mm:
(-[WebFullScreenController enterFullscreen:]):
(-[WebFullScreenController exitFullscreen]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76416 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
index 121250d..18772f4 100644
--- a/Source/WebKit/mac/ChangeLog
+++ b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-21 Mark Rowe <mrowe at apple.com>
+
+ Rubber-stamped by Jon Honeycutt.
+
+ Fix the build when using Clang by removing some unused variables.
+
+ * Plugins/Hosted/WebHostedNetscapePluginView.mm:
+ (-[WebHostedNetscapePluginView updateAndSetWindow]):
+ * WebView/WebFullScreenController.mm:
+ (-[WebFullScreenController enterFullscreen:]):
+ (-[WebFullScreenController exitFullscreen]):
+
2011-01-21 Chris Rogers <crogers at google.com>
Reviewed by Darin Fisher.
diff --git a/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm b/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
index 5593050..7effb61 100644
--- a/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
+++ b/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
@@ -209,7 +209,6 @@ extern "C" {
_proxy->resize(boundsInWindow, visibleRectInWindow);
- CGRect layerBounds = NSRectToCGRect(boundsInWindow);
CGRect bounds = NSRectToCGRect([self bounds]);
CGRect frame = NSRectToCGRect([self frame]);
diff --git a/Source/WebKit/mac/WebView/WebFullScreenController.mm b/Source/WebKit/mac/WebView/WebFullScreenController.mm
index 6529435..5b8b496 100644
--- a/Source/WebKit/mac/WebView/WebFullScreenController.mm
+++ b/Source/WebKit/mac/WebView/WebFullScreenController.mm
@@ -397,7 +397,6 @@ private:
[[self window] setCollectionBehavior:behavior];
NSView* animationView = [[self _fullscreenWindow] animationView];
- NSRect viewBounds = [animationView bounds];
NSRect backgroundBounds = {[[self window] convertScreenToBase:screenFrame.origin], screenFrame.size};
backgroundBounds = [animationView convertRectFromBase:backgroundBounds];
@@ -462,8 +461,7 @@ private:
CATransform3D moveTransform = CATransform3DMakeTranslation(_initialFrame.origin.x - shrunkDestinationFrame.origin.x, _initialFrame.origin.y - shrunkDestinationFrame.origin.y, 0);
CATransform3D finalTransform = CATransform3DConcat(shrinkTransform, moveTransform);
[rendererLayer setTransform:finalTransform];
- CGRect translatedDestinationFrame = [rendererLayer convertRect:destinationFrame toLayer:[animationView layer]];
-
+
CALayer* backgroundLayer = [[self _fullscreenWindow] backgroundLayer];
// Start the opacity animation. We can use implicit animations here because we don't care when
@@ -600,10 +598,9 @@ private:
CATransform3D moveTransform = CATransform3DMakeTranslation(layerEndFrame.origin.x - shrunkDestinationFrame.origin.x, layerEndFrame.origin.y - shrunkDestinationFrame.origin.y, 0);
CATransform3D finalTransform = CATransform3DConcat(shrinkTransform, moveTransform);
[rendererLayer setTransform:finalTransform];
- CGRect translatedDestinationFrame = [rendererLayer convertRect:layerStartFrame toLayer:[animationView layer]];
-
+
CFTimeInterval duration = [self _animationDuration];
-
+
CALayer* backgroundLayer = [[self _fullscreenWindow] backgroundLayer];
[CATransaction begin];
[CATransaction setAnimationDuration:duration];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list