Changeset 149820 in webkit
- Timestamp:
- May 9, 2013 9:54:24 AM (11 years ago)
- Location:
- trunk/Source/WebKit/blackberry
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
r149810 r149820 654 654 // no overhead in the unlikely case where the compositor is not needed. 655 655 Platform::userInterfaceThreadMessageClient()->dispatchSyncMessage( 656 656 createMethodCallMessage(&WebPagePrivate::createCompositor, this)); 657 657 #endif 658 658 } … … 844 844 bool WebPage::executeJavaScriptInIsolatedWorld(const std::wstring& script, JavaScriptDataType& returnType, BlackBerry::Platform::String& returnValue) 845 845 { 846 // On our platform wchar_t is unsigned intand UChar is unsigned short846 // On our platform wchar_t is unsigned and UChar is unsigned short 847 847 // so we have to convert using ICU conversion function 848 848 int lengthCopied = 0; … … 1243 1243 1244 1244 IntPoint newScrollPosition(IntPoint(max(0, static_cast<int>(roundf(anchor.x() - anchorOffset.x() / inverseScale))), 1245 1245 max(0, static_cast<int>(roundf(anchor.y() - anchorOffset.y() / inverseScale))))); 1246 1246 1247 1247 if (m_webPage->settings()->textReflowMode() == WebSettings::TextReflowEnabled) { … … 1251 1251 if (m_currentPinchZoomNode) 1252 1252 newScrollPosition = calculateReflowedScrollPosition(anchorOffset, scale == minimumScale() ? 1 : inverseScale); 1253 1254 1253 m_currentPinchZoomNode = 0; 1254 m_anchorInNodeRectRatio = FloatPoint(-1, -1); 1255 1255 } 1256 1256 … … 1305 1305 1306 1306 return IntPoint(max(0, static_cast<int>(roundf(reflowedRect.x() + offsetX))), 1307 1307 max(0, static_cast<int>(roundf(reflowedRect.y() + offsetY - anchorOffset.y() / inverseScale)))); 1308 1308 } 1309 1309 … … 1500 1500 // The center of the visible contents rect in float. 1501 1501 return FloatPoint(visibleContentsRect.x() + visibleContentsRect.width() / 2.0, 1502 1502 visibleContentsRect.y() + visibleContentsRect.height() / 2.0); 1503 1503 } 1504 1504 … … 2517 2517 { 2518 2518 if (d->m_page->defersLoading()) 2519 return;2519 return; 2520 2520 d->assignFocus(direction); 2521 2521 } … … 3490 3490 } else { 3491 3491 if (m_backingStore->d->isOpenGLCompositing()) 3492 setCompositorDrawsRootLayer(false);3492 setCompositorDrawsRootLayer(false); 3493 3493 3494 3494 // Rendering was disabled while we were hidden, so we need to update all tiles. … … 3553 3553 FloatPoint centerOfVisibleContentsRect = this->centerOfVisibleContentsRect(); 3554 3554 bool newVisibleRectContainsOldVisibleRect = (m_actualVisibleHeight <= transformedActualVisibleSize.height()) 3555 3555 && (m_actualVisibleWidth <= transformedActualVisibleSize.width()); 3556 3556 3557 3557 bool atInitialScale = m_webPage->isAtInitialZoom(); … … 4216 4216 } 4217 4217 4218 bool WebPage::deleteTextRelativeToCursor(unsigned int leftOffset, unsigned intrightOffset)4218 bool WebPage::deleteTextRelativeToCursor(unsigned leftOffset, unsigned rightOffset) 4219 4219 { 4220 4220 if (d->m_page->defersLoading()) … … 4867 4867 } 4868 4868 4869 void WebPage::addVisitedLink(const unsigned short* url, unsigned intlength)4869 void WebPage::addVisitedLink(const unsigned short* url, unsigned length) 4870 4870 { 4871 4871 ASSERT(d->m_page); … … 4948 4948 { 4949 4949 if ((m_webSettings->shouldHandlePatternUrls() && protocolIs(url, "pattern")) 4950 4951 4952 4953 4954 4955 4950 || protocolIs(url, "tel") 4951 || protocolIs(url, "wtai") 4952 || protocolIs(url, "cti") 4953 || protocolIs(url, "mailto") 4954 || protocolIs(url, "sms") 4955 || protocolIs(url, "pin")) { 4956 4956 return url; 4957 4957 } … … 5041 5041 { 5042 5042 if (d->m_fullScreenPluginView.get()) 5043 d->m_fullScreenPluginView->handleSwipeEvent();5043 d->m_fullScreenPluginView->handleSwipeEvent(); 5044 5044 else 5045 notifyFullScreenVideoExited(true);5045 notifyFullScreenVideoExited(true); 5046 5046 } 5047 5047 … … 5049 5049 { 5050 5050 FOR_EACH_PLUGINVIEW(d->m_pluginViews) 5051 (*it)->handleScreenPowerEvent(powered);5051 (*it)->handleScreenPowerEvent(powered); 5052 5052 } 5053 5053 … … 5436 5436 5437 5437 // Don't bail if the layers were removed and we now need a one shot drawing sync as a consequence. 5438 if (!(m_frameLayers && m_frameLayers->hasLayer()) && !m_overlayLayer 5439 && !m_needsOneShotDrawingSynchronization) 5438 if (!(m_frameLayers && m_frameLayers->hasLayer()) && !m_overlayLayer && !m_needsOneShotDrawingSynchronization) 5440 5439 return false; 5441 5440 … … 5549 5548 5550 5549 if (!layer) { 5551 5552 5553 5554 5550 ASSERT(m_frameLayers); 5551 m_frameLayers->removeLayerByFrame(frame); 5552 if (!m_frameLayers->hasLayer()) 5553 m_frameLayers.clear(); 5555 5554 } else { 5556 5555 if (!m_frameLayers) … … 5637 5636 void WebPagePrivate::releaseLayerResourcesCompositingThread() 5638 5637 { 5639 5638 m_compositor->releaseLayerResources(); 5640 5639 } 5641 5640 -
trunk/Source/WebKit/blackberry/Api/WebPageClient.h
r149125 r149820 91 91 92 92 virtual void notifyLoadStarted() = 0; 93 virtual void notifyLoadCommitted(const unsigned short* originalUrl, unsigned int originalUrlLength, const unsigned short* finalUrl, unsigned int finalUrlLength, const unsigned short* networkToken, unsigned intnetworkTokenLength) = 0;94 virtual void notifyLoadFailedBeforeCommit(const unsigned short* originalUrl, unsigned int originalUrlLength, const unsigned short* finalUrl, unsigned int finalUrlLength, const unsigned short* networkToken, unsigned intnetworkTokenLength) = 0;95 virtual void notifyLoadToAnchor(const unsigned short* url, unsigned int urlLength, const unsigned short* networkToken, unsigned intnetworkTokenLength) = 0;93 virtual void notifyLoadCommitted(const unsigned short* originalUrl, unsigned originalUrlLength, const unsigned short* finalUrl, unsigned finalUrlLength, const unsigned short* networkToken, unsigned networkTokenLength) = 0; 94 virtual void notifyLoadFailedBeforeCommit(const unsigned short* originalUrl, unsigned originalUrlLength, const unsigned short* finalUrl, unsigned finalUrlLength, const unsigned short* networkToken, unsigned networkTokenLength) = 0; 95 virtual void notifyLoadToAnchor(const unsigned short* url, unsigned urlLength, const unsigned short* networkToken, unsigned networkTokenLength) = 0; 96 96 virtual void notifyLoadProgress(int percentage) = 0; 97 97 virtual void notifyLoadReadyToRender(bool pageIsVisuallyNonEmpty) = 0; 98 98 virtual void notifyFirstVisuallyNonEmptyLayout() = 0; 99 99 virtual void notifyLoadFinished(int status) = 0; 100 virtual void notifyClientRedirect(const unsigned short* originalUrl, unsigned int originalUrlLength, const unsigned short* finalUrl, unsigned intfinalUrlLength) = 0;100 virtual void notifyClientRedirect(const unsigned short* originalUrl, unsigned originalUrlLength, const unsigned short* finalUrl, unsigned finalUrlLength) = 0; 101 101 102 102 virtual void notifyFrameDetached(const WebFrame) = 0; -
trunk/Source/WebKit/blackberry/Api/WebPage_p.h
r149711 r149820 97 97 // and the viewport size is called the transformedActualVisibleSize. 98 98 class WebPagePrivate : public PageClientBlackBerry 99 99 , public WebSettingsDelegate 100 100 #if USE(ACCELERATED_COMPOSITING) 101 102 #endif 103 101 , public WebCore::GraphicsLayerClient 102 #endif 103 , public Platform::GuardedPointerBase { 104 104 public: 105 105 enum ViewMode { Desktop, FixedDesktop }; -
trunk/Source/WebKit/blackberry/ChangeLog
r149819 r149820 1 2013-05-09 Mike Fenton <mifenton@rim.com> 2 3 [BlackBerry] Style updates required based on new check-webkit-style 4 https://bugs.webkit.org/show_bug.cgi?id=115857 5 6 Reviewed by Rob Buis. 7 8 Update WebPage and WebPageClient to match check-webkit-style updates. 9 10 * Api/WebPage.cpp: 11 (BlackBerry::WebKit::WebPagePrivate::init): 12 (BlackBerry::WebKit::WebPage::executeJavaScriptInIsolatedWorld): 13 (BlackBerry::WebKit::WebPagePrivate::zoomAboutPoint): 14 (BlackBerry::WebKit::WebPagePrivate::calculateReflowedScrollPosition): 15 (BlackBerry::WebKit::WebPagePrivate::centerOfVisibleContentsRect): 16 (BlackBerry::WebKit::WebPage::assignFocus): 17 (BlackBerry::WebKit::WebPagePrivate::resumeBackingStore): 18 (BlackBerry::WebKit::WebPagePrivate::setViewportSize): 19 (BlackBerry::WebKit::WebPage::deleteTextRelativeToCursor): 20 (BlackBerry::WebKit::WebPage::addVisitedLink): 21 (BlackBerry::WebKit::WebPagePrivate::findPatternStringForUrl): 22 (BlackBerry::WebKit::WebPage::notifySwipeEvent): 23 (BlackBerry::WebKit::WebPage::notifyScreenPowerStateChanged): 24 (BlackBerry::WebKit::WebPagePrivate::commitRootLayerIfNeeded): 25 (BlackBerry::WebKit::WebPagePrivate::setRootLayerWebKitThread): 26 (BlackBerry::WebKit::WebPagePrivate::releaseLayerResourcesCompositingThread): 27 * Api/WebPageClient.h: 28 * Api/WebPage_p.h: 29 1 30 2013-05-09 Mike Fenton <mifenton@rim.com> 2 31
Note: See TracChangeset
for help on using the changeset viewer.