Move double-theme protection into bundleWithFile:.

[winterboard.git] / WBMarkup.mm

diff --git a/WBMarkup.mm b/WBMarkup.mm
index 73066d4a7854a12cbac18859ec3e57b417ee6575..ff7c98ab9b3f1aeede4a00988c498c372357da0d 100644 (file)
--- a/WBMarkup.mm
+++ b/WBMarkup.mm
@@ -1,14 +1,17 @@
 #include "WBMarkup.h"
 
 #include "WBMarkup.h"
 

+#include <substrate.h>
+
+MSClassHook(UIWebDocumentView)
+

 @class WKView;
 
 @class WKView;
 

-extern "C" {
-    void WebThreadLock();
-    CGContextRef WKGetCurrentGraphicsContext();
-    void WKViewLockFocus(WKView *);
-    void WKViewUnlockFocus(WKView *);
-    void WKViewDisplayRect(WKView *, CGRect);
-}
+extern "C" void WebThreadLock();
+extern "C" CGContextRef WKGetCurrentGraphicsContext();
+
+static void (*WKViewLockFocus$)(WKView *);
+static void (*WKViewUnlockFocus$)(WKView *);
+static void (*WKViewDisplayRect$)(WKView *, CGRect);

 
 @interface DOMElement : NSObject
 - (void) setInnerHTML:(NSString *)value;
 
 @interface DOMElement : NSObject
 - (void) setInnerHTML:(NSString *)value;


@@ -60,10 +63,28 @@ extern "C" {
 - (void) setContentView:(WebView *)view;
 @end
 
 - (void) setContentView:(WebView *)view;
 @end
 

+@interface UIWebDocumentView : NSObject
+- (WebView *) webView;
+@end
+

 static WBMarkup *SharedMarkup_;
 
 @implementation WBMarkup
 
 static WBMarkup *SharedMarkup_;
 
 @implementation WBMarkup
 

++ (void) initialize {
+    MSImageRef WebCore(MSGetImageByName("/System/Library/PrivateFrameworks/WebCore.framework/WebCore"));
+    MSHookSymbol(WKViewLockFocus$, "_WKViewLockFocus", WebCore);
+    MSHookSymbol(WKViewUnlockFocus$, "_WKViewUnlockFocus", WebCore);
+    MSHookSymbol(WKViewDisplayRect$, "_WKViewDisplayRect", WebCore);
+
+    MSImageRef JavaScriptCore(MSGetImageByName("/System/Library/Frameworks/JavaScriptCore.framework/JavaScriptCore"));
+
+    void (*_ZN3JSC19initializeThreadingEv)();
+    MSHookSymbol(_ZN3JSC19initializeThreadingEv, "__ZN3JSC19initializeThreadingEv", JavaScriptCore);
+    if (_ZN3JSC19initializeThreadingEv != NULL)
+        (*_ZN3JSC19initializeThreadingEv)();
+}
+

 + (BOOL) isSharedMarkupCreated {
     return SharedMarkup_ != nil;
 }
 + (BOOL) isSharedMarkupCreated {
     return SharedMarkup_ != nil;
 }


@@ -78,9 +99,11 @@ static WBMarkup *SharedMarkup_;
     if ((self = [super init]) != nil) {
         WebThreadLock();
 
     if ((self = [super init]) != nil) {
         WebThreadLock();
 

-        SharedMarkup_ = self;
+        if ($UIWebDocumentView == Nil)
+            view_ = [[WebView alloc] initWithFrame:CGRectMake(0, 0, 640, 5000)];
+        else
+            view_ = [[[$UIWebDocumentView alloc] initWithFrame:CGRectMake(0, 0, 640, 5000)] webView];

 
 

-        view_ = [[WebView alloc] initWithFrame:CGRectMake(0, 0, 640, 5000)];

         [view_ setDrawsBackground:NO];
 
         WebPreferences *preferences([[WebPreferences alloc] initWithIdentifier:@"com.apple.webkit.webmarkup"]);
         [view_ setDrawsBackground:NO];
 
         WebPreferences *preferences([[WebPreferences alloc] initWithIdentifier:@"com.apple.webkit.webmarkup"]);


@@ -117,9 +140,9 @@ static WBMarkup *SharedMarkup_;
             [view_ _drawRect:draw context:context_ lockFocus:YES];
         else {
             WKView *view([view_ _viewRef]);
             [view_ _drawRect:draw context:context_ lockFocus:YES];
         else {
             WKView *view([view_ _viewRef]);

-            WKViewLockFocus(view); {
-                WKViewDisplayRect(view, draw);
-            } WKViewUnlockFocus(view);
+            WKViewLockFocus$(view); {
+                WKViewDisplayRect$(view, draw);
+            } WKViewUnlockFocus$(view);

         }
     } CGContextRestoreGState(context_);
 }
         }
     } CGContextRestoreGState(context_);
 }


@@ -136,7 +159,7 @@ static WBMarkup *SharedMarkup_;
     origin_ = CGPointZero;
 }
 
     origin_ = CGPointZero;
 }
 

-- (CGSize) sizeOfMarkup:(NSString *)markup forWidth:(float)width {
+- (CGSize) sizeOfMarkup:(NSString *)markup forWidth:(CGFloat)width {

     WebThreadLock();
 
     if (![self _webPrepareContextForTextDrawing:NO])
     WebThreadLock();
 
     if (![self _webPrepareContextForTextDrawing:NO])


@@ -153,7 +176,7 @@ static WBMarkup *SharedMarkup_;
     return [[view_ mainFrame] renderedSizeOfNode:text_ constrainedToWidth:width];
 }
 
     return [[view_ mainFrame] renderedSizeOfNode:text_ constrainedToWidth:width];
 }
 

-- (CGSize) sizeOfString:(NSString *)string withStyle:(NSString *)style forWidth:(float)width {
+- (CGSize) sizeOfString:(NSString *)string withStyle:(NSString *)style forWidth:(CGFloat)width {

     WebThreadLock();
 
     if (![self _webPrepareContextForTextDrawing:NO])
     WebThreadLock();
 
     if (![self _webPrepareContextForTextDrawing:NO])


@@ -175,7 +198,7 @@ static WBMarkup *SharedMarkup_;
     return style;
 }
 
     return style;
 }
 

-- (void) _setupWithStyle:(NSString *)style width:(float)width height:(float)height {
+- (void) _setupWithStyle:(NSString *)style width:(CGFloat)width height:(CGFloat)height {

     WebThreadLock();
 
     if (style != nil && [style length] != 0)
     WebThreadLock();
 
     if (style != nil && [style length] != 0)