- Revision
- 88490
- Author
- [email protected]
- Date
- 2011-06-09 15:23:23 -0700 (Thu, 09 Jun 2011)
Log Message
2011-06-09 Sheriff Bot <[email protected]>
Unreviewed, rolling out r88468.
http://trac.webkit.org/changeset/88468
https://bugs.webkit.org/show_bug.cgi?id=62408
It broke build if !ENABLE(FULLSCREEN_API) (Requested by Ossy
on #webkit).
* fullscreen/full-screen-video-offset-expected.txt: Removed.
* fullscreen/full-screen-video-offset.html: Removed.
2011-06-09 Sheriff Bot <[email protected]>
Unreviewed, rolling out r88468.
http://trac.webkit.org/changeset/88468
https://bugs.webkit.org/show_bug.cgi?id=62408
It broke build if !ENABLE(FULLSCREEN_API) (Requested by Ossy
on #webkit).
* dom/Element.cpp:
(WebCore::adjustForLocalZoom):
* dom/Element.h:
* html/HTMLMediaElement.cpp:
* html/HTMLMediaElement.h:
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (88489 => 88490)
--- trunk/LayoutTests/ChangeLog 2011-06-09 22:02:22 UTC (rev 88489)
+++ trunk/LayoutTests/ChangeLog 2011-06-09 22:23:23 UTC (rev 88490)
@@ -1,3 +1,15 @@
+2011-06-09 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r88468.
+ http://trac.webkit.org/changeset/88468
+ https://bugs.webkit.org/show_bug.cgi?id=62408
+
+ It broke build if !ENABLE(FULLSCREEN_API) (Requested by Ossy
+ on #webkit).
+
+ * fullscreen/full-screen-video-offset-expected.txt: Removed.
+ * fullscreen/full-screen-video-offset.html: Removed.
+
2011-06-09 Kenneth Russell <[email protected]>
Reviewed by Adam Barth.
Deleted: trunk/LayoutTests/fullscreen/full-screen-video-offset-expected.txt (88489 => 88490)
--- trunk/LayoutTests/fullscreen/full-screen-video-offset-expected.txt 2011-06-09 22:02:22 UTC (rev 88489)
+++ trunk/LayoutTests/fullscreen/full-screen-video-offset-expected.txt 2011-06-09 22:23:23 UTC (rev 88490)
@@ -1,9 +0,0 @@
-This layout test checks that the offset size and position of a video element does not change when the it enters full-screen mode. Press go full-screen to begin.
-EVENT(webkitfullscreenchange)
-EXPECTED (document.webkitCurrentFullScreenElement == '[object HTMLVideoElement]') OK
-EXPECTED (video.offsetLeft == '8') OK
-EXPECTED (video.offsetTop == '48') OK
-EXPECTED (video.offsetWidth == '300') OK
-EXPECTED (video.offsetHeight == '150') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/fullscreen/full-screen-video-offset.html (88489 => 88490)
--- trunk/LayoutTests/fullscreen/full-screen-video-offset.html 2011-06-09 22:02:22 UTC (rev 88489)
+++ trunk/LayoutTests/fullscreen/full-screen-video-offset.html 2011-06-09 22:23:23 UTC (rev 88490)
@@ -1,30 +0,0 @@
-<body _onload_="init()">
- <div>This layout test checks that the offset size and position of a video element does not change when the it enters full-screen mode. Press <button _onclick_="video.webkitRequestFullScreen()">go full-screen</a> to begin.</div>
- <video id="video" controls></video>
- <script src=""
- <script>
- var video = document.getElementById('video');
- function init() {
-
- // Bail out early if the full screen API is not enabled or is missing:
- if (Element.prototype.webkitRequestFullScreen == undefined) {
- logResult(false, "Element.prototype.webkitRequestFullScreen == undefined");
- endTest();
- } else {
- var videoState = {'offsetLeft': video.offsetLeft, 'offsetTop': video.offsetTop, 'offsetWidth': video.offsetWidth, 'offsetHeight': video.offsetHeight };
-
- var fullscreenChanged = function(event)
- {
- testExpected("document.webkitCurrentFullScreenElement", video);
- testExpected("video.offsetLeft", videoState.offsetLeft);
- testExpected("video.offsetTop", videoState.offsetTop);
- testExpected("video.offsetWidth", videoState.offsetWidth);
- testExpected("video.offsetHeight", videoState.offsetHeight);
- endTest();
- };
- waitForEvent(document, 'webkitfullscreenchange', fullscreenChanged);
- runWithKeyDown(function(){video.webkitRequestFullScreen()});
- }
- }
- </script>
-</body>
Modified: trunk/Source/WebCore/ChangeLog (88489 => 88490)
--- trunk/Source/WebCore/ChangeLog 2011-06-09 22:02:22 UTC (rev 88489)
+++ trunk/Source/WebCore/ChangeLog 2011-06-09 22:23:23 UTC (rev 88490)
@@ -1,3 +1,18 @@
+2011-06-09 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r88468.
+ http://trac.webkit.org/changeset/88468
+ https://bugs.webkit.org/show_bug.cgi?id=62408
+
+ It broke build if !ENABLE(FULLSCREEN_API) (Requested by Ossy
+ on #webkit).
+
+ * dom/Element.cpp:
+ (WebCore::adjustForLocalZoom):
+ * dom/Element.h:
+ * html/HTMLMediaElement.cpp:
+ * html/HTMLMediaElement.h:
+
2011-06-09 Kenneth Russell <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Source/WebCore/dom/Element.cpp (88489 => 88490)
--- trunk/Source/WebCore/dom/Element.cpp 2011-06-09 22:02:22 UTC (rev 88489)
+++ trunk/Source/WebCore/dom/Element.cpp 2011-06-09 22:23:23 UTC (rev 88490)
@@ -352,7 +352,7 @@
return zoomFactor;
}
-int Element::adjustForLocalZoom(int value, RenderObject* renderer)
+static int adjustForLocalZoom(int value, RenderObject* renderer)
{
float zoomFactor = localZoomForRenderer(renderer);
if (zoomFactor == 1)
Modified: trunk/Source/WebCore/dom/Element.h (88489 => 88490)
--- trunk/Source/WebCore/dom/Element.h 2011-06-09 22:02:22 UTC (rev 88489)
+++ trunk/Source/WebCore/dom/Element.h 2011-06-09 22:23:23 UTC (rev 88490)
@@ -151,10 +151,10 @@
void scrollByLines(int lines);
void scrollByPages(int pages);
- virtual int offsetLeft();
- virtual int offsetTop();
- virtual int offsetWidth();
- virtual int offsetHeight();
+ int offsetLeft();
+ int offsetTop();
+ int offsetWidth();
+ int offsetHeight();
Element* offsetParent();
int clientLeft();
int clientTop();
@@ -384,7 +384,6 @@
void idAttributeChanged(Attribute*);
- static int adjustForLocalZoom(int value, RenderObject* renderer);
private:
void scrollByUnits(int units, ScrollGranularity);
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (88489 => 88490)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2011-06-09 22:02:22 UTC (rev 88489)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2011-06-09 22:23:23 UTC (rev 88490)
@@ -58,7 +58,6 @@
#include "MouseEvent.h"
#include "MIMETypeRegistry.h"
#include "Page.h"
-#include "RenderFullScreen.h"
#include "RenderVideo.h"
#include "RenderView.h"
#include "ScriptEventListener.h"
@@ -2717,47 +2716,7 @@
return 0;
}
-static RenderBlock* elementPlaceholder(Element* element)
-{
- RenderObject* renderer = element->renderer();
- RenderObject* parent = renderer ? renderer->parent() : 0;
- RenderFullScreen* fullScreen = parent && parent->isRenderFullScreen() ? toRenderFullScreen(parent) : 0;
- return fullScreen ? fullScreen->placeholder() : 0;
}
-int HTMLMediaElement::offsetLeft()
-{
- int left = Element::offsetLeft();
- if (RenderBlock* block = elementPlaceholder(this))
- left = Element::adjustForLocalZoom(block->offsetLeft(), block);
- return left;
-}
-
-int HTMLMediaElement::offsetTop()
-{
- int top = Element::offsetTop();
- if (RenderBlock* block = elementPlaceholder(this))
- top = Element::adjustForLocalZoom(block->offsetTop(), block);
- return top;
-}
-
-int HTMLMediaElement::offsetWidth()
-{
- int width = Element::offsetWidth();
- if (RenderBlock* block = elementPlaceholder(this))
- width = Element::adjustForLocalZoom(block->offsetWidth(), block);
- return width;
-}
-
-int HTMLMediaElement::offsetHeight()
-{
- int height = Element::offsetHeight();
- if (RenderBlock* block = elementPlaceholder(this))
- height = Element::adjustForLocalZoom(block->offsetHeight(), block);
- return height;
-}
-
-}
-
#endif
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (88489 => 88490)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2011-06-09 22:02:22 UTC (rev 88489)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2011-06-09 22:23:23 UTC (rev 88490)
@@ -203,12 +203,6 @@
bool isPlaying() const { return m_playing; }
- // Override Element implementations
- virtual int offsetLeft();
- virtual int offsetTop();
- virtual int offsetWidth();
- virtual int offsetHeight();
-
protected:
HTMLMediaElement(const QualifiedName&, Document*);
virtual ~HTMLMediaElement();
