From e6236fbfb7c5da5eac32efbbe4f3da93803c0663 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Thu, 16 Aug 2012 18:46:58 +0000 Subject: [PATCH] [BlackBerry] Remove Mobile mode from WebPage.cpp and WebPage_p.h https://bugs.webkit.org/show_bug.cgi?id=94223 PR #192773 Patch by Leo Yang on 2012-08-16 Reviewed by Rob Buis. Reviewed internally by Arvid Nilsson. Remove Mobile mode as it's not been used. Also remove code that handle top-level SVG document because now we can handle it in Desktop mode. * Api/WebPage.cpp: (BlackBerry::WebKit::WebPagePrivate::setLoadState): (BlackBerry::WebKit::WebPagePrivate::fixedLayoutSize): * Api/WebPage_p.h: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125796 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/blackberry/Api/WebPage.cpp | 38 ++------------------------------ Source/WebKit/blackberry/Api/WebPage_p.h | 2 +- Source/WebKit/blackberry/ChangeLog | 17 ++++++++++++++ 3 files changed, 20 insertions(+), 37 deletions(-) diff --git a/Source/WebKit/blackberry/Api/WebPage.cpp b/Source/WebKit/blackberry/Api/WebPage.cpp index bde5f04..bf9e1e8 100644 --- a/Source/WebKit/blackberry/Api/WebPage.cpp +++ b/Source/WebKit/blackberry/Api/WebPage.cpp @@ -1093,16 +1093,6 @@ void WebPagePrivate::setLoadState(LoadState state) didReceiveTouchEventMode(ProcessedTouchEvents); #endif - // If it's a outmost SVG document, we use FixedDesktop mode, otherwise - // we default to Mobile mode. For example, using FixedDesktop mode to - // render http://www.croczilla.com/bits_and_pieces/svg/samples/tiger/tiger.svg - // is user-experience friendly. - if (m_page->mainFrame()->document()->isSVGDocument()) { - setShouldUseFixedDesktopMode(true); - setViewMode(FixedDesktop); - } else - setViewMode(Mobile); - // Reset block zoom and reflow. resetBlockZoom(); #if ENABLE(VIEWPORT_REFLOW) @@ -2536,32 +2526,8 @@ IntSize WebPagePrivate::fixedLayoutSize(bool snapToIncrement) const return IntSize(width, height); } - if (m_webSettings->isZoomToFitOnLoad()) { - // We need to clamp the layout width to the minimum of the layout - // width or the content width. This is important under rotation for mobile - // websites. We want the page to remain layouted at the same width which - // it was loaded with, and instead change the zoom level to fit to screen. - // The height is welcome to adapt to the height used in the new orientation, - // otherwise we will get a grey bar below the web page. - if (m_mainFrame->view() && !contentsSize().isEmpty()) - minWidth = contentsSize().width(); - else { - // If there is no contents width, use the minimum of screen width - // and layout width to shape the first layout to a contents width - // that we could reasonably zoom to fit, in a manner that takes - // orientation into account and still respects a small default - // layout width. -#if ENABLE(ORIENTATION_EVENTS) - minWidth = m_mainFrame->orientation() % 180 - ? Platform::Graphics::Screen::primaryScreen()->height() - : Platform::Graphics::Screen::primaryScreen()->width(); -#else - minWidth = Platform::Graphics::Screen::primaryScreen()->width(); -#endif - } - } - - return IntSize(std::min(minWidth, defaultLayoutWidth), defaultLayoutHeight); + ASSERT_NOT_REACHED(); + return IntSize(defaultLayoutWidth, defaultLayoutHeight); } BackingStoreClient* WebPagePrivate::backingStoreClientForFrame(const Frame* frame) const diff --git a/Source/WebKit/blackberry/Api/WebPage_p.h b/Source/WebKit/blackberry/Api/WebPage_p.h index 34b0160..04eb1b7 100644 --- a/Source/WebKit/blackberry/Api/WebPage_p.h +++ b/Source/WebKit/blackberry/Api/WebPage_p.h @@ -91,7 +91,7 @@ class WebPagePrivate : public PageClientBlackBerry #endif , public Platform::GuardedPointerBase { public: - enum ViewMode { Mobile, Desktop, FixedDesktop }; + enum ViewMode { Desktop, FixedDesktop }; enum LoadState { None /* on instantiation of page */, Provisional, Committed, Finished, Failed }; WebPagePrivate(WebPage*, WebPageClient*, const WebCore::IntRect&); diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog index b4f5c91..56faba2 100644 --- a/Source/WebKit/blackberry/ChangeLog +++ b/Source/WebKit/blackberry/ChangeLog @@ -1,3 +1,20 @@ +2012-08-16 Leo Yang + + [BlackBerry] Remove Mobile mode from WebPage.cpp and WebPage_p.h + https://bugs.webkit.org/show_bug.cgi?id=94223 + PR #192773 + + Reviewed by Rob Buis. + Reviewed internally by Arvid Nilsson. + + Remove Mobile mode as it's not been used. Also remove code that + handle top-level SVG document because now we can handle it in Desktop mode. + + * Api/WebPage.cpp: + (BlackBerry::WebKit::WebPagePrivate::setLoadState): + (BlackBerry::WebKit::WebPagePrivate::fixedLayoutSize): + * Api/WebPage_p.h: + 2012-08-16 Arvid Nilsson [BlackBerry] SurfacePool::waitForBuffer() sometimes waits for deleted EGLSyncKHR object -- 1.8.3.1