[minijoe] r73 committed - fixed merge errors.

[min...@googlecode.com]

Revision: 73
Author: maksim.lin
Date: Tue Jun 1 05:54:54 2010
Log: fixed merge errors.
http://code.google.com/p/minijoe/source/detail?r=73

Modified:
/trunk/src/com/google/minijoe/html/HtmlWidget.java
/trunk/src/com/google/minijoe/samples/browser/HtmlBrowser.java

=======================================
--- /trunk/src/com/google/minijoe/html/HtmlWidget.java Tue Jun 1 05:33:57
2010
+++ /trunk/src/com/google/minijoe/html/HtmlWidget.java Tue Jun 1 05:54:54
2010
@@ -352,7 +352,9 @@
}
synchronized (styleSheet) {
styleOutdated = false;
- element.apply(styleSheet, new Vector());
+ Vector applyAnywhere = new Vector();
+ applyAnywhere.addElement(styleSheet);
+ element.apply(new Vector(), applyAnywhere);
}
if (!OPTIMIZE || needsBuild) {
synchronized (this) {
=======================================
--- /trunk/src/com/google/minijoe/samples/browser/HtmlBrowser.java Mon Feb
22 16:37:29 2010
+++ /trunk/src/com/google/minijoe/samples/browser/HtmlBrowser.java Tue Jun
1 05:54:54 2010
@@ -160,7 +160,7 @@
}
Object res = s.htmlWidget.getResource(url, -1, null);
if (res != null) {
- source.addResource(url, res);
+ source.addResource(url, res, -1);
return;
}
}