Title: [126807] trunk/Source/WebKit/blackberry
- Revision
- 126807
- Author
- [email protected]
- Date
- 2012-08-27 15:33:49 -0700 (Mon, 27 Aug 2012)
Log Message
Unreviewed, rolling out r126772.
http://trac.webkit.org/changeset/126772
https://bugs.webkit.org/show_bug.cgi?id=95137
"This change breaks news.qq.com" (Requested by leoyang on
#webkit).
Patch by Sheriff Bot <[email protected]> on 2012-08-27
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::fixedLayoutSize):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (126806 => 126807)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-27 22:27:16 UTC (rev 126806)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-08-27 22:33:49 UTC (rev 126807)
@@ -2495,20 +2495,11 @@
}
if (m_viewMode == Desktop) {
- int width;
- if (m_pendingOrientation == -1) {
- // If we detect an overflow larger than the contents size then use that instead since
- // it'll still be clamped by the maxWidth below...
- width = std::max(absoluteVisibleOverflowSize().width(), contentsSize().width());
- } else {
- if (!m_nestedLayoutFinishedCount)
- width = 0;
- else {
- // Don't consider absoluteVisibleOverflowSize when we are in the middle of determining final layout size.
- // See PR #190469.
- width = contentsSize().width();
- }
- }
+ // If we detect an overflow larger than the contents size then use that instead since
+ // it'll still be clamped by the maxWidth below...
+ int width = std::max(absoluteVisibleOverflowSize().width(), contentsSize().width());
+ if (m_pendingOrientation != -1 && !m_nestedLayoutFinishedCount)
+ width = 0;
if (snapToIncrement) {
// Snap to increments of defaultLayoutWidth / 2.0.
Modified: trunk/Source/WebKit/blackberry/ChangeLog (126806 => 126807)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-27 22:27:16 UTC (rev 126806)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-27 22:33:49 UTC (rev 126807)
@@ -1,3 +1,15 @@
+2012-08-27 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r126772.
+ http://trac.webkit.org/changeset/126772
+ https://bugs.webkit.org/show_bug.cgi?id=95137
+
+ "This change breaks news.qq.com" (Requested by leoyang on
+ #webkit).
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::fixedLayoutSize):
+
2012-08-27 Leo Yang <[email protected]>
[BlackBerry] Not using absoluteVisibleOverSize when rotating
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
