Changeset 23128 in webkit

Timestamp:

Mar 20, 2007 2:13:54 AM (17 years ago)

Author:

hyatt

Message:

Land advanced text ( turned off )

Location:

branches/WindowsMerge/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• platform/win/FontCacheWin.cpp (modified) (1 diff)
• platform/win/FontDataWin.cpp (modified) (4 diffs)
• platform/win/FontWin.cpp (modified) (2 diffs)
• platform/win/UniscribeController.cpp (added)
• platform/win/UniscribeController.h (added)

branches/WindowsMerge/WebCore/ChangeLog

@@ +1 @@
+2007-03-20  Dave Hyatt  <hyatt@apple.com>
+
+        Land advanced text code path (turned off).
+       
+        Reviewed by aroben
+        
+        * WebCore.vcproj/WebCore.vcproj:
+        * platform/win/FontCacheWin.cpp:
+        (WebCore::FontCache::createFontPlatformData):
+        * platform/win/FontDataWin.cpp:
+        (WebCore::FontData::platformInit):
+        (WebCore::FontData::platformDestroy):
+        (WebCore::FontData::smallCapsFontData):
+        (WebCore::FontData::scriptFontProperties):
+        * platform/win/FontWin.cpp:
+        (WebCore::Font::drawComplexText):
+        (WebCore::Font::floatWidthForComplexText):
+        (WebCore::Font::offsetForPositionForComplexText):
+        * platform/win/UniscribeController.cpp: Added.
+        (WebCore::UniscribeController::UniscribeController):
+        (WebCore::UniscribeController::resetControlAndState):
+        (WebCore::UniscribeController::shapeAndPlaceItem):
+        (WebCore::UniscribeController::shape):
+        * platform/win/UniscribeController.h: Added.
+        (WebCore::UniscribeController::width):
+        (WebCore::UniscribeController::glyphBuffer):
+
 2007-03-20  Anders Carlsson  <acarlsson@apple.com>
 

branches/WindowsMerge/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -3024 +3024 @@
                                 <File
                                         RelativePath="..\platform\win\TextBoundariesWin.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\platform\win\UniscribeController.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\platform\win\UniscribeController.h"
                                         >
                                 </File>

branches/WindowsMerge/WebCore/platform/win/FontCacheWin.cpp

@@ -107 +107 @@
 
     // The size here looks unusual.  The negative number is intentional.  The logical size constant is 32.
-    winfont.lfHeight = -fontDescription.computedPixelSize();
+    winfont.lfHeight = -fontDescription.computedPixelSize() * 32;
     winfont.lfWidth = 0;
     winfont.lfEscapement = 0;

branches/WindowsMerge/WebCore/platform/win/FontDataWin.cpp

@@ -106 +106 @@
     RestoreDC(dc, -1);
     ReleaseDC(0, dc);
+
+    m_scriptCache = 0;
+    m_scriptFontProperties = 0;
 }
 
@@ -122 +125 @@
     // We don't hash this on Win32, so it's effectively owned by us.
     delete m_smallCapsFontData;
+
+    ScriptFreeCache(&m_scriptCache);
+    delete m_scriptFontProperties;
 }
 
@@ -130 +136 @@
         GetObject(m_font.hfont(), sizeof(LOGFONT), &winfont);
         int smallCapsHeight = lroundf(0.70f * fontDescription.computedSize());
-        winfont.lfHeight = -smallCapsHeight;
+        winfont.lfHeight = -smallCapsHeight * 32;
         HFONT hfont = CreateFontIndirect(&winfont);
         m_smallCapsFontData = new FontData(FontPlatformData(hfont, smallCapsHeight, fontDescription.bold(), fontDescription.italic()));
@@ -189 +195 @@
 }
 
-}
+SCRIPT_FONTPROPERTIES* FontData::scriptFontProperties() const
+{
+    if (!m_scriptFontProperties) {
+        m_scriptFontProperties = new SCRIPT_FONTPROPERTIES;
+        memset(m_scriptFontProperties, 0, sizeof(SCRIPT_FONTPROPERTIES));
+        m_scriptFontProperties->cBytes = sizeof(SCRIPT_FONTPROPERTIES);
+        HRESULT result = ScriptGetFontProperties(0, scriptCache(), m_scriptFontProperties);
+        if (result == E_PENDING) {
+            HDC dc = GetDC(0);
+            SaveDC(dc);
+            SelectObject(dc, m_font.hfont());
+            ScriptGetFontProperties(dc, scriptCache(), m_scriptFontProperties);
+            RestoreDC(dc, -1);
+            ReleaseDC(0, dc);
+        }
+    }
+    return m_scriptFontProperties;
+}
+
+}

branches/WindowsMerge/WebCore/platform/win/FontWin.cpp

@@ -33 +33 @@
 #include "IntRect.h"
 #include "NotImplemented.h"
+#include "UniscribeController.h"
 #include <ApplicationServices/ApplicationServices.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
@@ -96 +97 @@
 }
 
-void Font::drawComplexText(GraphicsContext* graphicsContext, const TextRun& run, const TextStyle& style, const FloatPoint& point) const
+void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const TextStyle& style, const FloatPoint& point) const
 {
-    LOG_NOIMPL();
+    // Constructing the controller itemizes and shapes the run.
+    UniscribeController controller(this, run, style, context);
+
+    // FIXME: Handle from/to values set in the run so that selection works.
+    if (controller.glyphBuffer().isEmpty())
+        return;
+    drawGlyphBuffer(context, controller.glyphBuffer(), run, style, point);
 }
 
 float Font::floatWidthForComplexText(const TextRun& run, const TextStyle& style) const
 {
-    LOG_NOIMPL();
-    return 0;
+    // Copied from the Mac code, although not sure why this would ever happen.
+    if (run.from() == run.to())
+        return 0;
+
+    // Constructing the controller itemizes and shapes the run.
+    UniscribeController controller(this, run, style);
+    return controller.width();
 }
 
 int Font::offsetForPositionForComplexText(const TextRun& run, const TextStyle& style, int x, bool includePartialGlyphs) const
 {
-    LOG_NOIMPL();
     return 0;
 }