From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 28 Aug 2015 17:24:20 +0000 (-0700)
Subject: Merge "Fix prevent issues" into devel/master
X-Git-Tag: dali_1.1.2~12
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=2047844bb3b4a84231905c8c540d34d4c468e5ad;hp=-c

Merge "Fix prevent issues" into devel/master
---

2047844bb3b4a84231905c8c540d34d4c468e5ad
diff --combined dali-toolkit/internal/text/text-controller-impl.cpp
index f90d014,0bbe637..55b5893
--- a/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl.cpp
@@@ -78,20 -78,20 +78,20 @@@ namespace Tex
   * @param[in] numberOfGlyphs The number of glyphs.
   * @param[out] glyphMetrics Some glyph metrics (font height, advance, ascender and x bearing).
   * @param[in] visualModel The visual model.
 - * @param[in] fontClient The font client.
 + * @param[in] metrics Used to access metrics from FontClient.
   */
  void GetGlyphsMetrics( GlyphIndex glyphIndex,
                         Length numberOfGlyphs,
                         GlyphMetrics& glyphMetrics,
 -                       VisualModelPtr visualModel,
 -                       TextAbstraction::FontClient& fontClient )
 +                       VisualModelPtr& visualModel,
 +                       MetricsPtr& metrics )
  {
    const GlyphInfo* glyphsBuffer = visualModel->mGlyphs.Begin();
  
    const GlyphInfo& firstGlyph = *( glyphsBuffer + glyphIndex );
  
    Text::FontMetrics fontMetrics;
 -  fontClient.GetFontMetrics( firstGlyph.fontId, fontMetrics );
 +  metrics->GetFontMetrics( firstGlyph.fontId, fontMetrics );
  
    glyphMetrics.fontHeight = fontMetrics.height;
    glyphMetrics.advance = firstGlyph.advance;
@@@ -423,7 -423,7 +423,7 @@@ void Controller::Impl::UpdateModel( Ope
    if( GET_GLYPH_METRICS & operations )
    {
      GlyphInfo* glyphsBuffer = glyphs.Begin();
 -    mFontClient.GetGlyphMetrics( glyphsBuffer, numberOfGlyphs );
 +    mMetrics->GetGlyphMetrics( glyphsBuffer, numberOfGlyphs );
  
      // Update the width and advance of all new paragraph characters.
      for( Vector<GlyphIndex>::ConstIterator it = newParagraphGlyphs.Begin(), endIt = newParagraphGlyphs.End(); it != endIt; ++it )
@@@ -487,7 -487,7 +487,7 @@@ float Controller::Impl::GetDefaultFontL
    }
  
    Text::FontMetrics fontMetrics;
 -  mFontClient.GetFontMetrics( defaultFontId, fontMetrics );
 +  mMetrics->GetFontMetrics( defaultFontId, fontMetrics );
  
    return( fontMetrics.ascender - fontMetrics.descender );
  }
@@@ -881,7 -881,7 +881,7 @@@ void Controller::Impl::RetrieveSelectio
    uint32_t lengthOfSelectedText =  mEventData->mRightSelectionPosition - startOfSelectedText;
  
    // Validate the start and end selection points
-   if( ( startOfSelectedText >= 0 ) && (  ( startOfSelectedText + lengthOfSelectedText ) <=  mLogicalModel->mText.Count() ) )
+   if(  ( startOfSelectedText + lengthOfSelectedText ) <=  mLogicalModel->mText.Count() )
    {
      //Get text as a UTF8 string
      Vector<Character>& utf32Characters = mLogicalModel->mText;
@@@ -1462,7 -1462,7 +1462,7 @@@ CharacterIndex Controller::Impl::GetClo
                        numberOfGlyphs,
                        glyphMetrics,
                        mVisualModel,
 -                      mFontClient );
 +                      mMetrics );
  
      const Vector2& position = *( positionsBuffer + glyphLogicalOrderIndex );
  
@@@ -1601,7 -1601,7 +1601,7 @@@ void Controller::Impl::GetCursorPositio
                      primaryNumberOfGlyphs,
                      glyphMetrics,
                      mVisualModel,
 -                    mFontClient );
 +                    mMetrics );
  
    // Whether to add the glyph's advance to the cursor position.
    // i.e if the paragraph is left to right and the logical cursor is zero, the position is the position of the first glyph and the advance is not added,
@@@ -1691,7 -1691,7 +1691,7 @@@
                        secondaryNumberOfGlyphs,
                        glyphMetrics,
                        mVisualModel,
 -                      mFontClient );
 +                      mMetrics );
  
      // Set the secondary cursor's position.
      cursorInfo.secondaryPosition.x = -glyphMetrics.xBearing + secondaryPosition.x + ( isCurrentRightToLeft ? 0.f : glyphMetrics.advance );
@@@ -1777,7 -1777,7 +1777,7 @@@ void Controller::Impl::UpdateCursorPosi
      }
  
      Text::FontMetrics fontMetrics;
 -    mFontClient.GetFontMetrics( defaultFontId, fontMetrics );
 +    mMetrics->GetFontMetrics( defaultFontId, fontMetrics );
  
      lineHeight = fontMetrics.ascender - fontMetrics.descender;