Title: [151412] trunk/Tools
- Revision
- 151412
- Author
- [email protected]
- Date
- 2013-06-10 17:38:55 -0700 (Mon, 10 Jun 2013)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=117449
Remove dead code for storing fonts in __DATA section
Reviewed by Dan Bernstein.
* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
Don't copy font resources to __DATA, as we don't have any code that reads them
from there (previously removed due to being under "defined(BUILDING_ON_LEOPARD)").
* DumpRenderTree/mac/DumpRenderTree.mm: (activateTestingFonts):
* WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm: (WTR::activateFonts):
Removed comments suggesting that we want to restore the old solution.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (151411 => 151412)
--- trunk/Tools/ChangeLog 2013-06-11 00:27:44 UTC (rev 151411)
+++ trunk/Tools/ChangeLog 2013-06-11 00:38:55 UTC (rev 151412)
@@ -1,3 +1,18 @@
+2013-06-10 Alexey Proskuryakov <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=117449
+ Remove dead code for storing fonts in __DATA section
+
+ Reviewed by Dan Bernstein.
+
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ Don't copy font resources to __DATA, as we don't have any code that reads them
+ from there (previously removed due to being under "defined(BUILDING_ON_LEOPARD)").
+
+ * DumpRenderTree/mac/DumpRenderTree.mm: (activateTestingFonts):
+ * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm: (WTR::activateFonts):
+ Removed comments suggesting that we want to restore the old solution.
+
2013-06-10 Bear Travis <[email protected]>
[CSS Shapes][CSS Exclusions] Split CSS Exclusions and CSS Shapes code
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (151411 => 151412)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2013-06-11 00:27:44 UTC (rev 151411)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2013-06-11 00:38:55 UTC (rev 151412)
@@ -21,7 +21,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-OTHER_LDFLAGS = -sectcreate __DATA Ahem qt/fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA HiraMaruMono-W4 fonts/SampleFont.sfont -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)
+OTHER_LDFLAGS = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY)
LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
PRODUCT_NAME = DumpRenderTree
GCC_ENABLE_OBJC_EXCEPTIONS = YES
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (151411 => 151412)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2013-06-11 00:27:44 UTC (rev 151411)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2013-06-11 00:38:55 UTC (rev 151412)
@@ -417,9 +417,6 @@
static void activateTestingFonts()
{
- // Work around <rdar://problem/6698023> by activating fonts from disk
- // FIXME: This code can be removed once <rdar://problem/6698023> is addressed.
-
static const char* fontFileNames[] = {
"AHEM____.TTF",
"WebKitWeightWatcher100.ttf",
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm (151411 => 151412)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm 2013-06-11 00:27:44 UTC (rev 151411)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm 2013-06-11 00:38:55 UTC (rev 151412)
@@ -223,8 +223,6 @@
void activateFonts()
{
- // Work around <rdar://problem/6698023> by activating fonts from disk
-
static const char* fontFileNames[] = {
"AHEM____.TTF",
"WebKitWeightWatcher100.ttf",
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes