Changeset 109592 in webkit
- Timestamp:
- Mar 2, 2012 11:48:17 AM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r109589 r109592 1 2012-03-02 Adam Treat <atreat@rim.com> 2 3 https://bugs.webkit.org/show_bug.cgi?id=80161 4 PR: 141157 5 6 BlackBerryPlatformScreen.h API has been updated. Reflect those 7 changes in our usage. 8 9 Reviewed by Antonio Gomes. 10 Internally reviewed by Jakob Petsovits 11 12 * platform/blackberry/PlatformScreenBlackBerry.cpp: 13 (WebCore::screenAvailableRect): 14 (WebCore::screenRect): 15 1 16 2012-03-02 Julien Chaffraix <jchaffraix@webkit.org> 2 17 -
trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp
r106678 r109592 44 44 FloatRect screenAvailableRect(Widget* widget) 45 45 { 46 return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen:: size())));46 return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size()))); 47 47 } 48 48 49 49 FloatRect screenRect(Widget* widget) 50 50 { 51 return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen:: size())));51 return FloatRect(FloatPoint(), FloatSize(IntSize(BlackBerry::Platform::Graphics::Screen::primaryScreen()->size()))); 52 52 } 53 53 -
trunk/Source/WebKit/blackberry/Api/BackingStore.cpp
r107863 r109592 2070 2070 int BackingStorePrivate::tileWidth() 2071 2071 { 2072 static int tileWidth = BlackBerry::Platform::Graphics::Screen:: landscapeWidth();2072 static int tileWidth = BlackBerry::Platform::Graphics::Screen::primaryScreen()->landscapeWidth(); 2073 2073 return tileWidth; 2074 2074 } … … 2076 2076 int BackingStorePrivate::tileHeight() 2077 2077 { 2078 static int tileHeight = BlackBerry::Platform::Graphics::Screen:: landscapeHeight();2078 static int tileHeight = BlackBerry::Platform::Graphics::Screen::primaryScreen()->landscapeHeight(); 2079 2079 return tileHeight; 2080 2080 } -
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
r109583 r109592 475 475 476 476 m_page->settings()->setSpatialNavigationEnabled(m_webSettings->isSpatialNavigationEnabled()); 477 blockClickRadius = int(roundf(0.35 * Platform::Graphics::Screen::p ixelsPerInch(0).width())); // The clicked rectangle area should be a fixed unit of measurement.477 blockClickRadius = int(roundf(0.35 * Platform::Graphics::Screen::primaryScreen()->pixelsPerInch(0).width())); // The clicked rectangle area should be a fixed unit of measurement. 478 478 479 479 m_page->settings()->setDelegateSelectionPaint(true); … … 1619 1619 IntSize WebPagePrivate::transformedViewportSize() const 1620 1620 { 1621 return Platform::Graphics::Screen:: size();1621 return Platform::Graphics::Screen::primaryScreen()->size(); 1622 1622 } 1623 1623 … … 2155 2155 #if ENABLE(ORIENTATION_EVENTS) 2156 2156 minWidth = m_mainFrame->orientation() % 180 2157 ? Platform::Graphics::Screen:: height()2158 : Platform::Graphics::Screen:: width();2157 ? Platform::Graphics::Screen::primaryScreen()->height() 2158 : Platform::Graphics::Screen::primaryScreen()->width(); 2159 2159 #else 2160 minWidth = Platform::Graphics::Screen:: width();2160 minWidth = Platform::Graphics::Screen::primaryScreen()->width(); 2161 2161 #endif 2162 2162 } … … 3010 3010 3011 3011 int desktopWidth = defaultMaxLayoutSize().width(); 3012 int deviceWidth = Platform::Graphics::Screen:: width();3013 int deviceHeight = Platform::Graphics::Screen:: height();3014 FloatSize currentPPI = Platform::Graphics::Screen::p ixelsPerInch(-1);3012 int deviceWidth = Platform::Graphics::Screen::primaryScreen()->width(); 3013 int deviceHeight = Platform::Graphics::Screen::primaryScreen()->height(); 3014 FloatSize currentPPI = Platform::Graphics::Screen::primaryScreen()->pixelsPerInch(-1); 3015 3015 int deviceDPI = int(roundf((currentPPI.width() + currentPPI.height()) / 2)); 3016 3016 if (m_viewportArguments.targetDensityDpi == ViewportArguments::ValueAuto) { … … 3379 3379 return; 3380 3380 3381 IntSize screenSize = Platform::Graphics::Screen:: size();3381 IntSize screenSize = Platform::Graphics::Screen::primaryScreen()->size(); 3382 3382 ASSERT(size.width() <= screenSize.width() && size.height() <= screenSize.height()); 3383 3383 m_defaultLayoutSize = size.expandedTo(minimumLayoutSize).shrunkTo(screenSize); … … 5539 5539 static IntSize size; 5540 5540 if (size.isEmpty()) 5541 size = IntSize(std::max(1024, Platform::Graphics::Screen:: landscapeWidth()),5542 std::max(768, Platform::Graphics::Screen:: landscapeHeight()));5541 size = IntSize(std::max(1024, Platform::Graphics::Screen::primaryScreen()->landscapeWidth()), 5542 std::max(768, Platform::Graphics::Screen::primaryScreen()->landscapeHeight())); 5543 5543 5544 5544 return size; -
trunk/Source/WebKit/blackberry/ChangeLog
r109583 r109592 1 2012-03-02 Adam Treat <atreat@rim.com> 2 3 https://bugs.webkit.org/show_bug.cgi?id=80161 4 PR: 141157 5 6 BlackBerryPlatformScreen.h API has been updated. Reflect those 7 changes in our usage. 8 9 Reviewed by Antonio Gomes. 10 Internally reviewed by Jakob Petsovits. 11 12 * Api/BackingStore.cpp: 13 (BlackBerry::WebKit::BackingStorePrivate::tileWidth): 14 (BlackBerry::WebKit::BackingStorePrivate::tileHeight): 15 * Api/WebPage.cpp: 16 (BlackBerry::WebKit::WebPagePrivate::init): 17 (BlackBerry::WebKit::WebPagePrivate::transformedViewportSize): 18 (BlackBerry::WebKit::WebPagePrivate::fixedLayoutSize): 19 (BlackBerry::WebKit::WebPagePrivate::recomputeVirtualViewportFromViewportArguments): 20 (BlackBerry::WebKit::WebPagePrivate::setDefaultLayoutSize): 21 (BlackBerry::WebKit::WebPagePrivate::defaultMaxLayoutSize): 22 * WebCoreSupport/FrameLoaderClientBlackBerry.cpp: 23 (WebCore::FrameLoaderClientBlackBerry::restoreViewState): 24 * WebKitSupport/SurfacePool.cpp: 25 (BlackBerry::WebKit::createCompositingSurface): 26 1 27 2012-03-02 Konrad Piascik <kpiascik@rim.com> 2 28 -
trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp
r109506 r109592 1059 1059 // When rotate happens, only zoom when previous page was zoomToFitScale, otherwise keep old scale. 1060 1060 if (orientationChanged && viewState.isZoomToFitScale) 1061 scale = BlackBerry::Platform::Graphics::Screen:: width() * scale / static_cast<double>(BlackBerry::Platform::Graphics::Screen::height());1061 scale = BlackBerry::Platform::Graphics::Screen::primaryScreen()->width() * scale / static_cast<double>(BlackBerry::Platform::Graphics::Screen::primaryScreen()->height()); 1062 1062 m_webPagePrivate->m_backingStore->d->suspendScreenAndBackingStoreUpdates(); // don't flash checkerboard for the setScrollPosition call 1063 1063 m_frame->view()->setContentsSizeFromHistory(contentsSize); -
trunk/Source/WebKit/blackberry/WebKitSupport/SurfacePool.cpp
r107401 r109592 39 39 static PassRefPtr<BackingStoreCompositingSurface> createCompositingSurface() 40 40 { 41 BlackBerry::Platform::IntSize screenSize = BlackBerry::Platform::Graphics::Screen:: size();41 BlackBerry::Platform::IntSize screenSize = BlackBerry::Platform::Graphics::Screen::primaryScreen()->size(); 42 42 return BackingStoreCompositingSurface::create(screenSize, false /*doubleBuffered*/); 43 43 }
Note: See TracChangeset
for help on using the changeset viewer.