Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1856)

Unified Diff: Source/platform/fonts/shaping/CachingWordShaper.cpp

Issue 1192223002: Optimize Complex Text Shaping and Caching (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: w/updated TestExpectations Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/fonts/shaping/CachingWordShaper.cpp
diff --git a/Source/platform/fonts/shaping/CachingWordShaper.cpp b/Source/platform/fonts/shaping/CachingWordShaper.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b9b2d77c9bad48c9dcf3cb0b6bdb9bb6fc0b6e61
--- /dev/null
+++ b/Source/platform/fonts/shaping/CachingWordShaper.cpp
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2015 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "platform/fonts/shaping/CachingWordShaper.h"
+
+#include "platform/fonts/SimpleFontData.h"
+#include "platform/fonts/shaping/CachingWordShapeIterator.h"
+#include "platform/fonts/shaping/HarfBuzzShaper.h"
+#include "platform/fonts/shaping/ShapeCache.h"
+#include "wtf/text/CharacterNames.h"
+
+namespace blink {
+
+CachingWordShaper::CachingWordShaper()
+{
+ m_shapeCache = new ShapeCache();
+}
+
+CachingWordShaper::~CachingWordShaper()
+{
+ delete m_shapeCache;
+}
+
+void CachingWordShaper::clear()
+{
+ if (m_shapeCache)
+ m_shapeCache->clear();
+}
+
+float CachingWordShaper::width(const Font* font, const TextRun& run,
+ HashSet<const SimpleFontData*>* fallbackFonts,
+ FloatRect* glyphBounds)
+{
+ float width = 0;
+ RefPtr<ShapeResult> wordResult;
+ CachingWordShapeIterator iterator(m_shapeCache, run, font, fallbackFonts);
+ while (iterator.next(&wordResult)) {
+ if (wordResult) {
+ width += wordResult->width();
+ if (glyphBounds)
+ glyphBounds->unite(wordResult->bounds());
+ }
+ }
+
+ return width;
+}
+
+static inline float shapeResultsForRun(ShapeCache* shapeCache, const Font* font,
+ const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts,
+ Vector<RefPtr<ShapeResult>>* results)
+{
+ CachingWordShapeIterator iterator(shapeCache, run, font, fallbackFonts);
+ RefPtr<ShapeResult> wordResult;
+ float totalWidth = 0;
+ while (iterator.next(&wordResult)) {
+ if (wordResult) {
+ results->append(wordResult);
+ totalWidth += wordResult->width();
+ }
+ }
+ return totalWidth;
+}
+
+float CachingWordShaper::fillGlyphBuffer(const Font* font, const TextRun& run,
+ HashSet<const SimpleFontData*>* fallbackFonts,
+ GlyphBuffer* glyphBuffer, unsigned from, unsigned to)
+{
+ Vector<RefPtr<ShapeResult>> results;
+ shapeResultsForRun(m_shapeCache, font, run, fallbackFonts, &results);
+
+ return ShapeResult::fillGlyphBuffer(results, glyphBuffer, run, from, to);
+}
+
+float CachingWordShaper::fillGlyphBufferForTextEmphasis(const Font* font,
+ const TextRun& run, const GlyphData* emphasisData, GlyphBuffer* glyphBuffer,
+ unsigned from, unsigned to)
+{
+ Vector<RefPtr<ShapeResult>> results;
+ shapeResultsForRun(m_shapeCache, font, run, nullptr, &results);
+
+ return ShapeResult::fillGlyphBufferForTextEmphasis(results, glyphBuffer,
+ run, emphasisData, from, to);
+}
+
+FloatRect CachingWordShaper::selectionRect(const Font* font, const TextRun& run,
+ const FloatPoint& point, int height, unsigned from, unsigned to)
+{
+ Vector<RefPtr<ShapeResult>> results;
+ float totalWidth = shapeResultsForRun(m_shapeCache, font, run, nullptr,
+ &results);
+
+ return ShapeResult::selectionRect(results, run.direction(), totalWidth,
+ point, height, from, to);
+}
+
+}; // namespace blink

Powered by Google App Engine
This is Rietveld 408576698