Changeset 145553 in webkit
- Timestamp:
- Mar 12, 2013 8:57:01 AM (11 years ago)
- Location:
- trunk/Source/WebKit/blackberry
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp
r145415 r145553 296 296 } 297 297 298 void InRegionScrollerPrivate::updateSelectionScrollView(const Node* node) 299 { 300 // TODO: don't notify the client if the node didn't change. 301 // Deleting the scrollview is handled by the client. 302 m_webPage->m_client->notifySelectionScrollView(firstScrollableInRegionForNode(node)); 303 } 304 298 305 Platform::ScrollViewBase* InRegionScrollerPrivate::firstScrollableInRegionForNode(const Node* node) 299 306 { -
trunk/Source/WebKit/blackberry/Api/InRegionScroller_p.h
r145415 r145553 54 54 void calculateInRegionScrollableAreasForPoint(const WebCore::IntPoint&); 55 55 const std::vector<Platform::ScrollViewBase*>& activeInRegionScrollableAreas() const; 56 Platform::ScrollViewBase* firstScrollableInRegionForNode(const WebCore::Node*);56 void updateSelectionScrollView(const WebCore::Node*); 57 57 58 58 void clearDocumentData(const WebCore::Document*); … … 64 64 65 65 private: 66 Platform::ScrollViewBase* firstScrollableInRegionForNode(const WebCore::Node*); 66 67 bool setLayerScrollPosition(WebCore::RenderLayer*, const WebCore::IntPoint& scrollPosition); 67 68 -
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
r144955 r145553 3312 3312 } 3313 3313 3314 void WebPagePrivate::updateSelectionScrollView(const Node* node) 3315 { 3316 m_inRegionScroller->d->updateSelectionScrollView(node); 3317 } 3318 3314 3319 void WebPagePrivate::updateDelegatedOverlays(bool dispatched) 3315 3320 { -
trunk/Source/WebKit/blackberry/Api/WebPageClient.h
r144955 r145553 160 160 virtual void notifySelectionHandlesReversed() = 0; 161 161 virtual void notifyCaretChanged(const Platform::IntRect& documentCaretRect, bool userTouchTriggered, bool isSingleLineInput = false, const Platform::IntRect& singleLineDocumentBoundingBox = Platform::IntRect(), bool textFieldIsEmpty = false) = 0; 162 virtual void notifySelectionScrollView(Platform::ScrollViewBase*) = 0; 162 163 163 164 virtual void cursorChanged(Platform::CursorType, const char* url, const Platform::IntPoint& hotSpotInImage) = 0; -
trunk/Source/WebKit/blackberry/Api/WebPage_p.h
r144750 r145553 323 323 void selectionChanged(WebCore::Frame*); 324 324 void setOverlayExpansionPixelHeight(int); 325 void updateSelectionScrollView(const WebCore::Node*); 325 326 326 327 void updateDelegatedOverlays(bool dispatched = false); -
trunk/Source/WebKit/blackberry/ChangeLog
r145534 r145553 1 2013-03-12 Genevieve Mak <gmak@rim.com> 2 3 [BlackBerry] Notify client if the selection is in a subframe when started. 4 https://bugs.webkit.org/show_bug.cgi?id=112065 5 6 Reviewed by Rob Buis. 7 8 PR #278490 9 Internally Reviewed by Mike Fenton. 10 11 * Api/InRegionScroller.cpp: 12 (BlackBerry::WebKit::InRegionScrollerPrivate::updateSelectionScrollView): 13 (WebKit): 14 * Api/InRegionScroller_p.h: 15 (InRegionScrollerPrivate): 16 * Api/WebPage.cpp: 17 (BlackBerry::WebKit::WebPagePrivate::updateSelectionScrollView): 18 (WebKit): 19 * Api/WebPageClient.h: 20 * Api/WebPage_p.h: 21 (WebPagePrivate): 22 * WebKitSupport/SelectionHandler.cpp: 23 (BlackBerry::WebKit::SelectionHandler::cancelSelection): 24 (BlackBerry::WebKit::SelectionHandler::setSelection): 25 1 26 2013-03-12 Alberto Garcia <agarcia@igalia.com> 2 27 -
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp
r145534 r145553 92 92 m_webPage->m_client->notifySelectionDetailsChanged(SelectionDetails()); 93 93 94 m_webPage->updateSelectionScrollView(0); 95 94 96 SelectionLog(Platform::LogLevelInfo, "SelectionHandler::cancelSelection"); 95 97 … … 537 539 } 538 540 541 if (!controller->selection().isRange()) 542 m_webPage->updateSelectionScrollView(newSelection.visibleEnd().deepEquivalent().anchorNode()); 543 539 544 newSelection.setIsDirectional(true); 540 545 … … 849 854 findNextAnimationOverlayRegion(); 850 855 856 if (granularity == WordGranularity) 857 m_webPage->updateSelectionScrollView(selection.visibleEnd().deepEquivalent().anchorNode()); 858 851 859 return true; 852 860 } … … 916 924 drawAnimationOverlay(regionForSelectionQuads(selection), false /* isExpandingOverlayAtConstantRate */, true /* isStartOfSelection */); 917 925 focusedFrame->selection()->setSelection(selection); 926 m_webPage->updateSelectionScrollView(node); 918 927 } 919 928
Note: See TracChangeset
for help on using the changeset viewer.